pidgin/pidgin

pidgin/pidgin/
Clean merge.
release-2.x.y
2014-01-11, Mark Doliner
dfe26ea283ee