pidgin/pidgin

Merge
release-2.x.y
2014-01-21, Daniel Atallah
c6b894d730dd
Merge
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im