pidgin/pidgin

pidgin/pidgin/
Clean merge.
release-2.x.y
2014-01-15, Mark Doliner
900c8ac8b4fb