diff ChangeLog.API @ 20142:743cb3444b6b

merge of '4f72579666e002cb42772fe52db9422fdbcfcdbb' and '7b44471a0827c3a4fcb9b5cb9d6af5c8be1c473e'
author Casey Harkins <charkins@pidgin.im>
date Tue, 18 Sep 2007 01:02:40 +0000
parents 51aff4db29da
children f33ed41b6dee 34fc2a999977 4511d15a8f80 5cd2fe9a6629
line wrap: on
line diff