pidgin/pidgin

Clean merge.
release-2.x.y
2014-01-21, Mark Doliner
8ecc9f2d4e66
Clean merge.
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im