From: Andre Noll <maan@systemlinux.org>
Date: Mon, 3 Dec 2007 18:39:06 +0000 (+0100)
Subject: Merge commit 'remotes/fml/master'
X-Git-Tag: v0.3.0~73
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=7a0852896a75d852dbd2ac848ec5c0be3b5dea71;p=paraslash.git

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

7a0852896a75d852dbd2ac848ec5c0be3b5dea71