diff ChangeLog @ 18547:3f45fdbfac1b

merge of '3ddd2f07e1ef153cfbf3a4181386d9fc01e7749d' and '8e4354cfd8a96879e34d2a0080d1a3723bf49360'
author Nathan Walp <nwalp@pidgin.im>
date Sat, 21 Jul 2007 02:17:34 +0000
parents 24ecab0d40b3
children 70c758256110
line wrap: on
line diff