From: Andre Noll <maan@systemlinux.org>
Date: Wed, 25 Jun 2008 16:39:37 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.3~54
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=39bb1a102b14e3f230a659290622b2d1b1658b44;p=paraslash.git

Merge commit 'meins/master'
---

39bb1a102b14e3f230a659290622b2d1b1658b44