Apply minor Haddock changes
Merge branch 'master' of github.com:pontarius/pontarius-xmpp