pidgin/pidgin

pidgin/pidgin/
Manual merge. Only 1 conflict, in ChangeLog
release-2.x.y
2014-01-09, Mark Doliner
829e8731d60c