From: Andre Noll <maan@systemlinux.org>
Date: Tue, 6 Oct 2009 21:16:27 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~12
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=4108592dd3ac3a4cbee530b64c6f9c8b6a60be99;p=paraslash.git

Merge branch 'maint'
---

4108592dd3ac3a4cbee530b64c6f9c8b6a60be99