Mercurial > pidgin
diff ChangeLog @ 30334:18608799619c
merge of '59221077cd501c7413d6d252249d6f987bbab30f'
and 'a64b15dea99395714cd38d5375d11e8e5c7ba3ef'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Sat, 07 Aug 2010 17:16:51 +0000 |
parents | bb1d593f185c |
children | 126317248aaa |