From: Andre Noll <maan@systemlinux.org>
Date: Sun, 22 Sep 2013 00:12:29 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.1~13
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=282a5e463090205ef8a12f50a9ecf6498b860e88;p=paraslash.git

Merge branch 'maint'

This incoporates a couple of important bug fixes found at athcx.
---

282a5e463090205ef8a12f50a9ecf6498b860e88