style
Merge branch 'master' of ssh://ssh.phx.nearlyfreespeech.net/home/public/
test event delete
Merge branch 'master' of ssh://ssh.phx.nearlyfreespeech.net/home/public/