From: Andre Noll <maan@systemlinux.org>
Date: Tue, 11 Dec 2007 16:40:50 +0000 (+0100)
Subject: Merge commit 'remotes/fml/master'
X-Git-Tag: v0.3.0~59^2~3
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=6de8cd316c938093c3d9e5e07d959daef4768575;p=paraslash.git

Merge commit 'remotes/fml/master'
---

6de8cd316c938093c3d9e5e07d959daef4768575