From: Marcus Eggenberger Date: Thu, 22 May 2008 14:52:04 +0000 (+0000) Subject: Merging branches/0.2/@r849 with trunk X-Git-Tag: 0.3.0~409 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=fc46caf2059654d81251412a13f5db4d40803948;hp=fc46caf2059654d81251412a13f5db4d40803948 Merging branches/0.2/@r849 with trunk ---