pidgin/pidgin

pidgin/pidgin/
Clean merge
release-2.x.y
2014-01-18, Mark Doliner
d4555d40f0b9