Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2
authorAlexander von Renteln <phon@quassel-irc.org>
Fri, 6 Jun 2008 09:32:50 +0000 (11:32 +0200)
committerAlexander von Renteln <phon@quassel-irc.org>
Fri, 6 Jun 2008 09:32:50 +0000 (11:32 +0200)

Trivial merge