diff ChangeLog.API @ 28288:5dad598188ed

merge of '6447eb03b5b0d21ec2d313005e95d66b4376eeae' and 'e4372ae7e8d466825e2baad0ab63a4293bc258de'
author maiku@pidgin.im
date Wed, 23 Sep 2009 10:02:08 +0000
parents 7686397d2282
children 31ff586b8ddc 6e9917e067e6
line wrap: on
line diff