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