actions...
Merge branch 'master' of https://github.com/nedry/QBBS

Conflicts:
	teleconference.rb