Merge the release-2.x.y branch from the main pidgin/main repo
release-2.x.y
2014-10-09, Mark Doliner