From: Marcus Eggenberger Date: Mon, 16 Jun 2008 14:38:55 +0000 (+0200) Subject: Merge branch 'master' of git@git.quassel-irc.org:quassel X-Git-Tag: 0.3.0~379 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=613850196857c7e29b0ef5c09175aadb9492642d Merge branch 'master' of git@git.quassel-irc.org:quassel --- 613850196857c7e29b0ef5c09175aadb9492642d