[Pkg-owncloud-commits] [owncloud] 43/59: Merge pull request #9695 from owncloud/revert-backport-9550-stable7

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 7e3a4b59a2b0be53de252a364e1c0b7c1f4f48cf
Merge: 0895324 36039ca
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Jul 17 11:02:39 2014 +0200

    Merge pull request #9695 from owncloud/revert-backport-9550-stable7
    
    Revert backport 9550 stable7

 lib/private/files/storage/local.php       | 13 ++-----------
 lib/private/files/storage/mappedlocal.php | 28 ++--------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

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