From: Sebastian Goth <seezer@roath.org>
Date: Thu, 26 Jun 2008 21:00:37 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: 0.3.0~342
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c6db8944e7792fe44a15c23aed10131b62115851;ds=sidebyside

Merge branch 'upstream'
---

c6db8944e7792fe44a15c23aed10131b62115851