From: Andre Noll <maan@systemlinux.org>
Date: Tue, 25 May 2010 07:23:44 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.4.3~20
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=80ce39491e340c83d05c2fa433f5033bd7bd80d4

Merge commit 'meins/master'
---

80ce39491e340c83d05c2fa433f5033bd7bd80d4