From: Andre Noll <maan@systemlinux.org>
Date: Thu, 20 Dec 2012 13:36:42 +0000 (+0100)
Subject: Merge branch 't/zero-rsync-fix'
X-Git-Tag: v0.1.5~4
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=ddd930000a7015369135258993be63c1a288fbf9;hp=ddd930000a7015369135258993be63c1a288fbf9;p=dss.git

Merge branch 't/zero-rsync-fix'
---