From: Andre Noll <maan@systemlinux.org>
Date: Mon, 1 Dec 2008 14:02:26 +0000 (+0100)
Subject: Merge commit 'meins/next'
X-Git-Tag: v0.3.4~91^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d9e608504d9d0e71380907559546e211c4f0ce55

Merge commit 'meins/next'
---

d9e608504d9d0e71380907559546e211c4f0ce55