pidgin/pidgin

Clean merge.
release-2.x.y
2014-01-21, Mark Doliner
c50107c76447
Clean merge.
a3d157700972b48cf0a23b300261a5ab0c6e165b v2.10.5
4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
ad7e7fb98db3bbd7bf9ab49072fd34cd4fa25dd9 v2.10.7