pidgin/pidgin

pidgin/pidgin/
Manual merge. Only 1 easy conflict in ChangeLog.
release-2.x.y
2014-04-12, Mark Doliner
a324d01ba1c5