pidgin/pidgin

Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962
Merge to default to fix conflicts
How to build Pidgin for Windows using MinGW
===========================================
For the latest build instructions, please refer to:
https://developer.pidgin.im/wiki/BuildingWinPidgin