HGKeeper

5fdaf1c7c04f

Merge heads of release-2.x.y branch. No overlapping files.

For information on hacking on Pidgin, Finch, or libpurple, see:

http://developer.pidgin.im