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

Merge branch 'maint'
---

a29e6451e79365af6dce8d14f3056fc107b059fb