From: Andre Noll <maan@systemlinux.org>
Date: Fri, 6 Feb 2009 17:01:53 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.4~66^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e9e6150fdba1687366956d358cc30ad9b0552523;p=paraslash.git

Merge commit 'meins/master'
---

e9e6150fdba1687366956d358cc30ad9b0552523