From: Andre Noll <maan@systemlinux.org>
Date: Mon, 9 Feb 2009 19:37:04 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.4~63^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=26d662890f5e1c29c0b09d1cac94b8b4acb065ed;p=paraslash.git

Merge commit 'meins/master'
---

26d662890f5e1c29c0b09d1cac94b8b4acb065ed