From: Andre Noll <maan@systemlinux.org>
Date: Tue, 2 Oct 2007 08:20:45 +0000 (+0200)
Subject: Merge commit 'remotes/meins/v0.3' into v0.3
X-Git-Tag: v0.3.0~317
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=fbfc694f85103a86c18469c6fdd2f4f03c812337

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

fbfc694f85103a86c18469c6fdd2f4f03c812337