From: Andre Noll <maan@systemlinux.org>
Date: Fri, 23 Oct 2009 08:38:17 +0000 (+0200)
Subject: Merge commit 'meins/maint' into maint
X-Git-Tag: v0.4.0~3^2~3
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=4036886aa97bab4d3d891f4fc9d4fcc75fb068b1;p=paraslash.git

Merge commit 'meins/maint' into maint
---

4036886aa97bab4d3d891f4fc9d4fcc75fb068b1