Merge from /pidgin/main using "hg pull https://hg.pidgin.im/pidgin/main"
release-2.x.y
2013-04-03, Mark Doliner