From: Andre Noll <maan@systemlinux.org>
Date: Mon, 13 Aug 2012 08:08:28 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.12~39
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=07542a1f126ad42b8d2ba9117fec539c13643e89;hp=-c;p=paraslash.git

Merge branch 'maint'
---

07542a1f126ad42b8d2ba9117fec539c13643e89