fixing pull / rebase aftermath
authorMarcus Eggenberger <egs@quassel-irc.org>
Sat, 16 Aug 2008 18:40:21 +0000 (20:40 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Sat, 16 Aug 2008 18:40:21 +0000 (20:40 +0200)

No differences found