diff ChangeLog @ 15472:8fc14c228ca8

merge of '4c75dce7720664ff3945c7a5382e99133a96839d' and 'a54eaea6163f0a2320ee05e44da3ca1a50445cc3'
author Nathan Walp <nwalp@pidgin.im>
date Wed, 31 Jan 2007 04:53:48 +0000
parents 74ab783e3676
children 4049f4d94c33
line wrap: on
line diff