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

Merge branch 'maint'
---

11e68b8de3eb8bf8b657333d5b8359260559e93b