pidgin/pidgin

Merge the release-2.x.y branch into default.

2014-02-01, Mark Doliner
3c9c77b80a6c
Merge the release-2.x.y branch into default.

A few manual merges... nothing too bad.
For information on hacking on Pidgin, Finch, or libpurple, see:
https://developer.pidgin.im