From: Andre Noll <maan@systemlinux.org>
Date: Wed, 12 May 2010 22:37:37 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.3~28
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e90440367f744a7723b201a95888e66f070ffa92;p=paraslash.git

Merge branch 'maint'
---

e90440367f744a7723b201a95888e66f070ffa92