From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 16 Nov 2014 09:36:05 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.4~48
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=abfb661f35e99e99c09a94d84839356d905af080

Merge branch 'maint'
---

abfb661f35e99e99c09a94d84839356d905af080