diff ChangeLog.API @ 17550:ef3f817cac91

merge of '73a92318a135ab11655ab5e68f5b079e16d72075' and 'e8e7793a2f8c520976c6e1f1cffe1c30697f44bf'
author Nathan Walp <nwalp@pidgin.im>
date Fri, 08 Jun 2007 12:52:35 +0000
parents 5eebb9b24e30
children d40fd7106ebf 0b3d6ea61760
line wrap: on
line diff