Merge branch 'master' of git@git.quassel-irc.org:quassel
authorMarcus Eggenberger <egs@quassel-irc.org>
Wed, 18 Jun 2008 17:01:15 +0000 (19:01 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Wed, 18 Jun 2008 17:01:15 +0000 (19:01 +0200)

Trivial merge