From: Andre Noll <maan@systemlinux.org>
Date: Mon, 9 Nov 2009 17:31:09 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.4.0~1
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=95818b8000f6862234a45e8511f4e2425fc25776;p=paraslash.git

Merge commit 'meins/master'
---

95818b8000f6862234a45e8511f4e2425fc25776