pidgin/pidgin

pidgin/pidgin/
Merge heads of release-2.x.y branch. No overlapping files.
release-2.x.y
2014-11-04, Mark Doliner
5fdaf1c7c04f