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