pidgin/pidgin

Clean merge.

2014-01-28, Mark Doliner
6f2f61656a95
Clean merge.
For information on hacking on Pidgin, Finch, or libpurple, see:
https://developer.pidgin.im