pidgin/pidgin

Merge with release-2.x.y

2014-11-07, Daniel Atallah
3b264e3c6710
Merge with release-2.x.y
For information on hacking on Pidgin, Finch, or libpurple, see:
https://developer.pidgin.im