From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sat, 27 Sep 2008 10:48:37 +0000 (+0200)
Subject: fixing merge aftermath
X-Git-Tag: 0.3.1~235
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=3ff2a8a6d3750fc5b68af6faeece5b60e7a25f20;hp=3ff2a8a6d3750fc5b68af6faeece5b60e7a25f20

fixing merge aftermath
---