From: Andre Noll <maan@systemlinux.org>
Date: Sun, 1 Dec 2013 10:40:40 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.1~5
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;ds=sidebyside;h=db3534991b7c1d72f9ceed435ecbcba39660a758;p=paraslash.git

Merge branch 'maint'
---

db3534991b7c1d72f9ceed435ecbcba39660a758