From: Andre Noll <maan@systemlinux.org>
Date: Sun, 23 May 2010 06:34:56 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.3~20^2~2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ffb2eaa90429f6d5c3d369509efcdf91c5463dad;p=paraslash.git

Merge branch 'maint'
---

ffb2eaa90429f6d5c3d369509efcdf91c5463dad