From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Mon, 1 Sep 2008 19:03:08 +0000 (+0200)
Subject: Merge branch 'master' of git@git.quassel-irc.org:quassel
X-Git-Tag: 0.3.1~307
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5225cf288d73e76905f85380ec52418c3b04efee;hp=-c

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

5225cf288d73e76905f85380ec52418c3b04efee