Mercurial > pidgin
diff ChangeLog @ 31539:5ec6859bf81a
merge of '15d262d25f6f81c8bf68b2de436e86b672f8d980'
and 'bf86d3d8ea90883936e561e4903aef752403a999'
| author | Bj?rn Voigt <bjoern@cs.tu-berlin.de> |
|---|---|
| date | Wed, 04 May 2011 06:46:04 +0000 |
| parents | 3e11fa72c5d8 |
| children | a8b4c78f53f0 bb4eaf8e70d6 |
