fixing some merge weirdness
authorMarcus Eggenberger <egs@quassel-irc.org>
Mon, 23 Jun 2008 11:30:23 +0000 (13:30 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Mon, 23 Jun 2008 11:30:23 +0000 (13:30 +0200)

No differences found