Merge branch 't/zero-rsync-fix'
authorAndre Noll <maan@systemlinux.org>
Thu, 20 Dec 2012 13:36:42 +0000 (14:36 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 20 Dec 2012 13:36:42 +0000 (14:36 +0100)
1  2 
dss.c

diff --cc dss.c
Simple merge