[Pkg-owncloud-commits] [owncloud] 141/199: Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager

[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 32a50563d3a93c304d7879212f349e6930d5b5d6
Merge: b8059fb 9ed5083
Author: Robin McCorkell <rmccorkell at karoshi.org.uk>
Date:   Thu May 29 17:52:28 2014 +0100

    Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager
    
    get mount point from mount manager

 apps/files_encryption/hooks/hooks.php | 22 ++++++----------------
 apps/files_encryption/lib/util.php    |  5 +++--
 2 files changed, 9 insertions(+), 18 deletions(-)

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