From: Andre Noll <maan@congo.fml.local>
Date: Thu, 20 Mar 2008 10:35:39 +0000 (+0100)
Subject: Merge commit 'remotes/meins/master'
X-Git-Tag: v0.0.4~19
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=cbd7c2d1bf41d2c14ace21b75b2362e8b151f99b

Merge commit 'remotes/meins/master'

Conflicts:

	dss.ggo
---

cbd7c2d1bf41d2c14ace21b75b2362e8b151f99b