[Pkg-owncloud-commits] [owncloud-client] 318/332: Merge branch 'il'

[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 95a77e5ccc22f7984d454b87bd844fd3709f2382
Merge: d8a8b53 21783ec
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Aug 7 14:29:27 2014 +0200

    Merge branch 'il'

 src/mirall/syncengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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