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