From: Andre Noll <maan@systemlinux.org>
Date: Fri, 27 Nov 2009 19:55:16 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.1~16
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=29a8e4384c08cb4e295e5b82994e62bf247a0ef7;p=paraslash.git

Merge branch 'maint'
---

29a8e4384c08cb4e295e5b82994e62bf247a0ef7