From: Andre Noll <maan@systemlinux.org>
Date: Mon, 7 Jul 2008 08:53:31 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.3~52
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=122af971c336b33df2e7233d3cea3287bbdae712;p=paraslash.git

Merge commit 'meins/master'
---

122af971c336b33df2e7233d3cea3287bbdae712