Mercurial > pidgin
diff ChangeLog @ 23464:1ac5faa72c8d
explicit merge of '9d90ebdb7e38fdd77bb504bc3302a083616360d9'
and '547cd65fb6e1faeb37d88730f0dbf45075a08426'
to branch 'im.pidgin.cpw.qulogic.msn'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 07 Jun 2008 03:10:15 +0000 |
| parents | 5f9793c8510a |
| children | ea341703b1d3 |
