From: Andre Noll <maan@systemlinux.org>
Date: Thu, 22 Oct 2009 17:24:44 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~8
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=d5d96c6c65b47a34136bc04420bffd38e947bfea;p=paraslash.git

Merge branch 'maint'
---

d5d96c6c65b47a34136bc04420bffd38e947bfea