From: Andre Noll <maan@systemlinux.org>
Date: Wed, 18 Nov 2009 18:24:28 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.1~114^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=802348691238fbca1b50f19a9331806a0786b097;p=paraslash.git

Merge branch 'maint'
---

802348691238fbca1b50f19a9331806a0786b097