pidgin/pidgin

pidgin/pidgin/
Clean merge.

2014-02-01, Mark Doliner
c651682dada0