From: Andre Noll <maan@systemlinux.org>
Date: Sun, 6 Apr 2014 06:19:26 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.2~4
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=56df9bb38aa4725f9244a7898d765608d8a1fffa;p=paraslash.git

Merge branch 'maint'
---

56df9bb38aa4725f9244a7898d765608d8a1fffa