From: Andre Noll <maan@systemlinux.org>
Date: Mon, 14 Jan 2008 09:15:39 +0000 (+0100)
Subject: Merge commit 'remotes/meins/master'
X-Git-Tag: v0.3.1~95
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=b88a9a0cbbb39e999ae4942ed596b17ce2ae7f23;ds=sidebyside

Merge commit 'remotes/meins/master'
---

b88a9a0cbbb39e999ae4942ed596b17ce2ae7f23