[Pkg-owncloud-commits] [owncloud] 20/111: Merge branch 'master' into encryption_fixes

[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 222fa88eec086a8332566bf6e9bce2eb20e9dd55
Merge: dd0ebce 3fa651f
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Nov 13 12:11:12 2013 +0100

    Merge branch 'master' into encryption_fixes

 apps/files_encryption/lib/helper.php       |   43 ++++++++++++++++++++++
 apps/files_encryption/lib/keymanager.php   |   54 ++++------------------------
 apps/files_encryption/lib/proxy.php        |    6 ++--
 apps/files_encryption/lib/util.php         |    5 +--
 apps/files_encryption/tests/helper.php     |   54 ++++++++++++++++++++++++++++
 apps/files_encryption/tests/keymanager.php |   17 ---------
 apps/files_trashbin/lib/trashbin.php       |    1 +
 apps/files_versions/lib/versions.php       |    3 ++
 lib/base.php                               |    2 ++
 lib/private/connector/sabre/file.php       |   28 +++++++++++++--
 10 files changed, 138 insertions(+), 75 deletions(-)


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