diff HACKING @ 32391:b30d7c76db03

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 83dd0d90742e9ccf6890fc21736440df73e48f24) to branch 'im.pidgin.pidgin' (head 31a6cb7c7aaed62b686fa3d4403dbed06d291abd)
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 13 Dec 2011 15:33:12 +0000
parents d73ee2690376
children
line wrap: on
line diff