Merge branch 'master' of github.com:cnaude/PurpleIRC.git