diff ChangeLog @ 16028:26e519aad395

merge of 'd36941e443b528a93bedee123adfcef05776a8c4' and 'd62256b61a542163041106f71bfb45189710d363'
author Nathan Walp <nwalp@pidgin.im>
date Mon, 09 Apr 2007 12:30:27 +0000
parents cc3c50816cc9
children 3da0548dc284
line wrap: on
line diff