From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 6 Sep 2015 14:07:43 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.5~5
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=6e0b28e02a1013c019a3225e922b71f913bfbae4;p=paraslash.git

Merge branch 'maint'
---

6e0b28e02a1013c019a3225e922b71f913bfbae4