Public and Private channels.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/StormyDragon/python-flist

Conflicts:
	flist/fchat.py