From: Andre Noll <maan@systemlinux.org>
Date: Fri, 9 Jan 2009 00:16:44 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.4~75^2~35
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=40de1dd2fdbb054444d585aa70e2d50166a66e07

Merge commit 'meins/master'
---

40de1dd2fdbb054444d585aa70e2d50166a66e07