Merge branch 'master' of git@git.quassel-irc.org:quassel
authorMarcus Eggenberger <egs@quassel-irc.org>
Mon, 1 Sep 2008 19:03:08 +0000 (21:03 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Mon, 1 Sep 2008 19:03:08 +0000 (21:03 +0200)

Trivial merge