pidgin/pidgin

Clean merge.

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