pidgin/pidgin

pidgin/pidgin/
Clean merge.
release-2.x.y
2014-01-28, Mark Doliner
dcd4c2fc9691