[Pkg-owncloud-commits] [owncloud-client] 94/175: Merge branch 'recall' into 1.8

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit fb2295fcecf8489654754ae544c47d39c698f6e2
Merge: 0af2f7e 3fcce08
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri May 22 10:32:26 2015 +0200

    Merge branch 'recall' into 1.8

 csync/tests/ownCloud/ownCloud/Test.pm |  3 +-
 csync/tests/ownCloud/t_recall.pl      | 85 +++++++++++++++++++++++++++++++++++
 src/libsync/propagatedownload.cpp     | 52 ++++++++++++++++++++-
 src/libsync/propagateupload.cpp       | 12 +++++
 4 files changed, 150 insertions(+), 2 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git