diff ChangeLog @ 17366:2284a8aad9ef

merge of '4751c73009c45ab1f2514522886dc9d36f66c7fb' and '646d2996dcbe3086c189b9eb507aeb6b1a00380d'
author Nathan Walp <nwalp@pidgin.im>
date Tue, 29 May 2007 04:43:56 +0000
parents 28682df9686a
children 1a1d9cf5cd79
line wrap: on
line diff