From: Andre Noll <maan@systemlinux.org>
Date: Fri, 4 Sep 2009 08:39:09 +0000 (+0200)
Subject: Merge commit 'meins/next' into next
X-Git-Tag: v0.4.0~30
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=2a31b78a03eeec52eb8e7d8d4d43e5f9d4315df2;hp=-c

Merge commit 'meins/next' into next
---

2a31b78a03eeec52eb8e7d8d4d43e5f9d4315df2