From: Andre Noll <maan@systemlinux.org>
Date: Fri, 10 Jul 2009 12:55:05 +0000 (+0200)
Subject: Merge commit 'meins/next' into next
X-Git-Tag: v0.4.0~52
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=217e8ee14425eea9b6a891e330068a2b536ff1f4;hp=-c

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

217e8ee14425eea9b6a891e330068a2b536ff1f4