Merge branch 'master' of git@git.quassel-irc.org:quassel