From: Andre Noll <maan@systemlinux.org>
Date: Thu, 8 Apr 2010 18:23:27 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.2~13
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e8089cd5efad59a5eec689117acf563a38b8c6c7;p=paraslash.git

Merge branch 'maint'
---

e8089cd5efad59a5eec689117acf563a38b8c6c7