[Pkg-owncloud-commits] [owncloud] 202/239: Merge pull request #5976 from owncloud/encryption_work_with_public_gallery

[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 5b7b0536346a4a6608e0b294b6784ac5ff3b142a
Merge: a819090 7f2bdb0
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Nov 27 04:25:54 2013 -0800

    Merge pull request #5976 from owncloud/encryption_work_with_public_gallery
    
    Encryption work with public gallery

 apps/files_encryption/lib/helper.php       | 43 ++++++++++++---
 apps/files_encryption/lib/keymanager.php   | 38 +++++++-------
 apps/files_encryption/lib/proxy.php        |  9 ++--
 apps/files_encryption/lib/stream.php       | 24 +++++----
 apps/files_encryption/lib/util.php         | 84 +++++++++++++-----------------
 apps/files_encryption/tests/crypt.php      | 16 +++---
 apps/files_encryption/tests/keymanager.php |  2 +-
 7 files changed, 123 insertions(+), 93 deletions(-)

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