From: Andre Noll <maan@systemlinux.org>
Date: Mon, 28 Sep 2009 15:44:06 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.4.0~23
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=2bda5cdb96fa0ca4f322e3b349ec2c6ce4aae97c;hp=2bda5cdb96fa0ca4f322e3b349ec2c6ce4aae97c

Merge commit 'meins/master'
---