[Pkg-owncloud-commits] [owncloud] 83/111: Merge pull request #5927 from owncloud/quota-excludeextstorage

[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 4a0d295e4ad2546049919a893ad219944466536a
Merge: cdc72dd 614e4d4
Author: Morris Jobke <morris.jobke at gmail.com>
Date:   Mon Nov 18 14:42:40 2013 -0800

    Merge pull request #5927 from owncloud/quota-excludeextstorage
    
    External storage space is now not counted in total space

 lib/private/files.php            |    4 ++--
 lib/private/files/filesystem.php |    6 ++++--
 lib/private/files/view.php       |    6 ++++--
 lib/private/helper.php           |    3 ++-
 tests/lib/files/view.php         |    5 +++++
 5 files changed, 17 insertions(+), 7 deletions(-)

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