diff ChangeLog @ 17463:93ecfed58d7d

merge of '632209b9e639ccf967e69fa29e4d7b8b8036d515' and '72fa43eeab1612c316f99f4817f8217f3e86531f'
author Nathan Walp <nwalp@pidgin.im>
date Wed, 30 May 2007 03:02:21 +0000
parents 2f8bfe3f76f0
children f5de0f3c0034
line wrap: on
line diff