From: Andre Noll <maan@systemlinux.org>
Date: Sun, 3 Nov 2013 11:53:53 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.1~8
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=1e97f6746b605e37826fb6ee2ad35b7b330145d6;p=paraslash.git

Merge branch 'maint'
---

1e97f6746b605e37826fb6ee2ad35b7b330145d6