pidgin/pidgin

Merge with no files.
release-2.x.y
2014-01-21, Mark Doliner
cfc982b1974a
Merge with no files.
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im