diff ChangeLog @ 18277:ad450d54e72d

merge of '12d65ba57d0e91f1bd68b923a95faab92a2bebe1' and 'b0753c11df84cce7262621801d1d625cb3366495'
author Nathan Walp <nwalp@pidgin.im>
date Mon, 25 Jun 2007 02:57:15 +0000
parents 40d51793f2d7
children cbec54ecd9ab b2caad7bc71b
line wrap: on
line diff