From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Wed, 18 Jun 2008 17:01:05 +0000 (+0200)
Subject: Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2
X-Git-Tag: 0.2.0-rc1~45
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=64f644c269f3aaf67624bf05e18ee762f2deaec8

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

64f644c269f3aaf67624bf05e18ee762f2deaec8