From: Andre Noll <maan@systemlinux.org>
Date: Mon, 9 Nov 2009 17:30:26 +0000 (+0100)
Subject: Merge commit 'meins/maint' into maint
X-Git-Tag: v0.4.0~2^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=8c5c975d5e8f209919283373793c2751a719699b;hp=-c

Merge commit 'meins/maint' into maint
---

8c5c975d5e8f209919283373793c2751a719699b