From: Alexander von Renteln <phon@quassel-irc.org>
Date: Fri, 6 Jun 2008 09:32:50 +0000 (+0200)
Subject: Merge branch '0.2' of git@git.quassel-irc.org:quassel into 0.2
X-Git-Tag: 0.2.0-rc1~72
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=058523b5b53cfcc0291747065ad1a1390e3b3f03;p=quassel.git

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

058523b5b53cfcc0291747065ad1a1390e3b3f03