pidgin/pidgin

pidgin/pidgin/
merging default back in

2017-11-24, Gary Kramlich
06a15795488e