From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Mon, 16 Jun 2008 14:38:46 +0000 (+0200)
Subject: Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2
X-Git-Tag: 0.2.0-rc1~61
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=792196c0b037cdbc230900f8776a048da95dc29d;p=quassel.git

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

792196c0b037cdbc230900f8776a048da95dc29d