Merge branch 'master' of github.com:StalkR/goirc into injection