[Pkg-owncloud-commits] [owncloud] 67/85: Merge pull request #9008 from owncloud/repair-parent-stable6

[David Prévot]

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

taffit pushed a commit to branch 6.0
in repository owncloud.

commit f6c970e214fc446b38b75eee5eb32e0c2fc9d3fa
Merge: 04817fb 84222e3
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Jun 16 15:00:22 2014 +0200

    Merge pull request #9008 from owncloud/repair-parent-stable6
    
    Repair broken parent link in the scanner - stable6

 lib/private/files/cache/scanner.php | 83 +++++++++++++++++++------------------
 tests/lib/files/cache/scanner.php   | 50 +++++++++++++++++++++-
 tests/lib/files/utils/scanner.php   |  4 +-
 3 files changed, 94 insertions(+), 43 deletions(-)

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