From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 10 May 2015 11:59:19 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/nullrw'
X-Git-Tag: v0.1.6~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=5c6308b8f35e0e138ef0e5c912fab3dc0c73469c

Merge branch 'refs/heads/t/nullrw'
---

5c6308b8f35e0e138ef0e5c912fab3dc0c73469c