[Pkg-owncloud-commits] [owncloud] 135/145: Merge branch 'stable6' of https://github.com/owncloud/core into stable6

[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 16e24dc4c554a578fe27449a9f04a5db1714a244
Merge: dc11b87 c8d34ea
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Tue Feb 25 13:56:30 2014 +0100

    Merge branch 'stable6' of https://github.com/owncloud/core into stable6

 apps/files_encryption/hooks/hooks.php | 17 ++++++--
 apps/files_encryption/tests/hooks.php | 55 +++++++++++++++++++++++++
 apps/files_encryption/tests/share.php | 75 ++++++++++++++++++++++++++++++++++-
 lib/private/files/view.php            |  2 +
 4 files changed, 144 insertions(+), 5 deletions(-)

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