From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Wed, 18 Jun 2008 17:01:15 +0000 (+0200)
Subject: Merge branch 'master' of git@git.quassel-irc.org:quassel
X-Git-Tag: 0.3.0~363
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0f206dd896485276cf25025e562c812b8c7fc5da;hp=-c

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

0f206dd896485276cf25025e562c812b8c7fc5da