pidgin/pidgin

Merge with release-2.x.y

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