From: Andre Noll <maan@systemlinux.org>
Date: Thu, 28 May 2009 09:19:25 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.5~41^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ce6b826b855d3760324a46d0687ddb4a110aa890;p=paraslash.git

Merge commit 'meins/master'
---

ce6b826b855d3760324a46d0687ddb4a110aa890