pidgin/pidgin

pidgin/pidgin/
Clean merge.

2014-01-28, Mark Doliner
6f2f61656a95