pidgin/pidgin

pidgin/pidgin/
Clean merge.
release-2.x.y
2014-01-21, Mark Doliner
c50107c76447