pidgin/pidgin

Merging, I guess?
release-2.x.y
2014-11-03, Richard Laager
c05804b2619a
Merging, I guess?
For information on translating Pidgin, libpurple, and Finch, please see
our wiki page at https://developer.pidgin.im/wiki/TipsForTranslators