Mercurial > pidgin
diff ChangeLog @ 32472:4db23cc97da4
merge of '13d6e924c9257b20e21050646cab88043bdb2e15'
and 'a07b7bfd5f979c74126ebea4f86249f24ff00dfd'
| author | andrew.victor@mxit.com |
|---|---|
| date | Mon, 09 Jan 2012 11:32:01 +0000 |
| parents | 307d487f21ee |
| children | af1c4fae7f74 |
