From: Andre Noll <maan@systemlinux.org>
Date: Mon, 30 Jun 2008 08:16:04 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.3.3~53
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=753b26859be2150d3f4e7840a86412f96f60627a;p=paraslash.git

Merge commit 'meins/master'
---

753b26859be2150d3f4e7840a86412f96f60627a