pidgin/pidgin

Merge release-2.x.y branch into master.

2014-11-04, Mark Doliner
fd55a0f119db
Merge release-2.x.y branch into master.

Minor manual merging in pidgin/gtkdialogs.c.
For information on hacking on Pidgin, Finch, or libpurple, see:
https://developer.pidgin.im