fixing merge aftermath
authorMarcus Eggenberger <egs@quassel-irc.org>
Sat, 27 Sep 2008 10:48:37 +0000 (12:48 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Sat, 27 Sep 2008 11:47:20 +0000 (13:47 +0200)

No differences found