pidgin/pidgin

Pull changes from ssh://hg@hg.pidgin.im/pidgin/main
release-2.x.y
2014-06-17, Mark Doliner
c4ebf4d738f9
Pull changes from ssh://hg@hg.pidgin.im/pidgin/main
Easy manual merge: Only conflicts were in ChangeLog.
How to build Pidgin for Windows using MinGW
===========================================
For the latest build instructions, please refer to:
http://developer.pidgin.im/wiki/BuildingWinPidgin