Mercurial > pidgin
diff ChangeLog @ 32372:0734b9c8c345
propagate from branch 'im.pidgin.pidgin.2.x.y' (head bc79b1bf09dcfa1d8edac86a06761fce7416e69c)
to branch 'im.pidgin.pidgin' (head 1f625d66be9b91c38a5398c3a4c302c651a19698)
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Wed, 30 Nov 2011 01:16:33 +0000 |
parents | ca4714f51bb1 d6cc1ff0d9b7 |
children | 3ed4800c5e17 |
line wrap: on
line diff