[Pkg-owncloud-commits] [owncloud-client] 17/69: Merge remote-tracking branch 'origin/fix_service_unavailable' into 1.7

[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 5723abe6ebf987c732ac2c625dfe1071215fe96f
Merge: 95a9b04 0692fea
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Oct 27 20:49:46 2014 +0100

    Merge remote-tracking branch 'origin/fix_service_unavailable' into 1.7

 csync/src/csync_update.c  | 11 +++++++++++
 src/mirall/syncengine.cpp |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

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