[Debian-ha-commits] [csync2] 02/05: Merge tag 'upstream/2.0-8-g175a01c'

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository csync2.

commit fa799ab61a7f9a7462a3e4ed63dd5f502a84fdeb
Merge: e9912e1 60c1f4b
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Wed Jun 15 20:57:42 2016 +0200

    Merge tag 'upstream/2.0-8-g175a01c'
    
    Upstream version 2.0-8-g175a01c

 csync2.c            | 24 ++++++++++----
 daemon.c            |  6 ++--
 tests/include.sh    | 10 ++++++
 tests/t/0004.diff.t | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 update.c            |  8 +++--
 5 files changed, 126 insertions(+), 12 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/csync2.git