pidgin/pidgin

Merge with no conflicts.
release-2.x.y
2014-01-13, Mark Doliner
3214e5d99b41
Merge with no conflicts.
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im