From: Andre Noll <maan@systemlinux.org>
Date: Mon, 13 Aug 2012 08:04:40 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.12~38^2~1
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=61cce28217df87368774831e2eb2d8636f79564b;p=paraslash.git

Merge branch 'maint'
---

61cce28217df87368774831e2eb2d8636f79564b