From: Andre Noll <maan@systemlinux.org>
Date: Mon, 7 Jan 2008 16:21:21 +0000 (+0100)
Subject: Merge commit 'remotes/yangtse/master'
X-Git-Tag: v0.3.0~11
X-Git-Url: https://git.tuebingen.mpg.de/?a=commitdiff_plain;h=695086cebfe6e44e61a6d11e64128c1f5d60fd4b;p=paraslash.git

Merge commit 'remotes/yangtse/master'
---

695086cebfe6e44e61a6d11e64128c1f5d60fd4b