pidgin/pidgin

pidgin/pidgin/
More missed merge conflicts

2017-03-10, Gary Kramlich
640928dfa2fc