pidgin/pidgin

Pull changes from ssh://hg@hg.pidgin.im/pidgin/main into the private

2014-06-17, Mark Doliner
c96cd4064dd3
Pull changes from ssh://hg@hg.pidgin.im/pidgin/main into the private
repo and merge heads.

Easy manual merge: Only conflicts were in ChangeLog.
For information on hacking on Pidgin, Finch, or libpurple, see:
https://developer.pidgin.im