Merge branch 'master' of git@git.quassel-irc.org:quassel
authorMarcus Eggenberger <egs@quassel-irc.org>
Mon, 16 Jun 2008 14:38:55 +0000 (16:38 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Mon, 16 Jun 2008 14:38:55 +0000 (16:38 +0200)

Trivial merge