pidgin/pidgin

Clean merge
release-2.x.y
2014-01-18, Mark Doliner
d4555d40f0b9
Clean merge
Features TODO (maybe)
=====================
Preferences
- Add joined channels to buddy list automatically (during
session)