From: Andre Noll <maan@systemlinux.org>
Date: Fri, 6 Nov 2009 14:22:10 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~3
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=684ea7f70948c9ce5077a8a6460946ff86fefe46;p=paraslash.git

Merge branch 'maint'
---

684ea7f70948c9ce5077a8a6460946ff86fefe46