[Pkg-owncloud-commits] [owncloud] 61/111: Merge pull request #5833 from owncloud/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 3ad546002f11b4e252890fa65ea64d3fd9682b9d
Merge: 6355af1 2624a6c
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Fri Nov 15 08:47:22 2013 -0800

    Merge pull request #5833 from owncloud/encryption_fixes
    
    [encryption] preserve timestamps and etags during encryption/decryption

 apps/files_encryption/lib/stream.php |   25 ++++++++-------
 apps/files_encryption/lib/util.php   |   22 ++++++-------
 apps/files_encryption/tests/util.php |   58 ++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 22 deletions(-)


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