diff ChangeLog @ 15472:4222b5790e0b

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