SSL for uMurmur!
specify pyparsing dependency as well
removing umurmur again (stays at feature branch)
author
removing channel, chan-lnks and password from info page
Bugfix: SSL enable/disable now properly stored in config
merging upstream _with_ umurmur plugin
Merge pull request #324 from heinzK1X/mumble

start of Mumble plugin
minor changes in umurmur
Merge remote-tracking branch 'upstream/master'
Revert "Bugfix: SSL enable/disable now properly stored in config"

This reverts commit 83ba9cfd8bc349989c34ffd3c7ccfc2390adf7e3.
Revert "minor changes in umurmur"

This reverts commit 907f635b2a161ca2f1b954eefb21686a5e458fb9.
removing umurmur from master again
now adding umurmur again, loosing all history..
towards running version of etherpad
adding umurmur back in
Merge branch 'etherpad' of https://github.com/heinzK1X/genesis into etherpad