pidgin/pidgin

pidgin/pidgin/
Merge with no conflicts.
release-2.x.y
2014-01-09, Mark Doliner
6057ecea67bf