pidgin/pidgin

Clean merge.

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