diff ChangeLog @ 20757:9c226e074462

merge of '4bbc209c8076ef89135700af844ec6bb04602c0a' and 'd2c7c4e1bf264ab31a0d42e7e61e316f2ad2a718'
author Luke Schierer <lschiere@pidgin.im>
date Tue, 02 Oct 2007 14:37:12 +0000
parents c757b4773a77
children ca17720fabb1 34de8ef19294
line wrap: on
line diff