From: Andre Noll <maan@systemlinux.org>
Date: Mon, 19 Nov 2007 09:08:58 +0000 (+0100)
Subject: Merge commit 'remotes/meins/v0.3' into v0.3
X-Git-Tag: v0.3.0~113
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=7d912dbad687503f2a8d4895b0e48b4584b4940b

Merge commit 'remotes/meins/v0.3' into v0.3
---

7d912dbad687503f2a8d4895b0e48b4584b4940b