pidgin/pidgin

pidgin/pidgin/
Merge default and clear up conflicts

2017-11-23, Gary Kramlich
0f364d739dfa