pidgin/pidgin

pidgin/pidgin/
Merge with no conflicts.
release-2.x.y
2014-01-13, Mark Doliner
3214e5d99b41