pidgin/pidgin

Merge pidgin/main release-2.x.y branch in private/main release-2.x.y branch
release-2.x.y
2014-10-16, Mark Doliner
4bf8cf402f8c
Merge pidgin/main release-2.x.y branch in private/main release-2.x.y branch

No merge conflicts.
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im