pidgin/pidgin

pidgin/pidgin/
Clean merge.

2014-01-23, Mark Doliner
2acee98e6c25