pidgin/pidgin

Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962
Merge to default to fix conflicts
For information on translating Pidgin, libpurple, and Finch, please see
our wiki page at https://developer.pidgin.im/wiki/TipsForTranslators