From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 19 Apr 2015 11:42:14 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.5~45
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=68630d8b55d688a7c7ce116951c310150aa9c166

Merge branch 'maint'
---

68630d8b55d688a7c7ce116951c310150aa9c166