| commit | 2c0b162c3481c885e60849b8145aae97d53748a7 | |
| author | Mark Doliner <markdoliner@pidgin.im> | |
| Sun, 6 May 2012 17:52:46 +0000 (6 17:52 +0000) | ||
| committer | Mark Doliner <markdoliner@pidgin.im> | |
| Sun, 6 May 2012 17:52:46 +0000 (6 17:52 +0000) | ||
| tree | 7d2e4aa531399880b4a84ed7776ddc6e106d31d2 | treesnapshot (tar.gz zip) |
| parent | 15ba3ac94cfc6801544ac0581555040ea5f6b041 | commitdiff |
| parent | a8f4c997561db1baee79c78b95ff010a64104748 | commitdiff |
Merge ... '9c23321e1b689003d3b54e1b879b816dd97e0adc'
and 'ba5526a7455daa7ff4165826503546ea797b2be9'
--HG--
branch : release-2.x.y
extra : convert_revision : ff142855237badeceb6d61e1d96f0410f94d6eaf
and 'ba5526a7455daa7ff4165826503546ea797b2be9'
--HG--
branch : release-2.x.y
extra : convert_revision : ff142855237badeceb6d61e1d96f0410f94d6eaf