From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sun, 15 Jun 2008 14:03:39 +0000 (+0200)
Subject: Merge branch 'master' of git@git.quassel-irc.org:quassel
X-Git-Tag: 0.3.0~381
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c8f0fad36b10552494f8ec3c3a45b52a3f0d2663;hp=-c

Merge branch 'master' of git@git.quassel-irc.org:quassel
---

c8f0fad36b10552494f8ec3c3a45b52a3f0d2663