pidgin/pidgin

Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962
Merge to default to fix conflicts
Features TODO (maybe)
=====================
Preferences
- Add joined channels to buddy list automatically (during
session)