[Pkg-owncloud-commits] [owncloud] 60/111: Merge pull request #5880 from owncloud/replace_etmp_files

[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 6355af162cf1c68aaf00eaf1d19b8b5fba7e84a0
Merge: fa44c69 f36ee69
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Nov 15 07:53:23 2013 -0800

    Merge pull request #5880 from owncloud/replace_etmp_files
    
    write encryption tmp files to the cache folder

 apps/files_encryption/lib/helper.php   |   51 +++++++++++++++++++++++++-------
 apps/files_encryption/lib/proxy.php    |   12 ++++++--
 apps/files_encryption/lib/stream.php   |    2 +-
 apps/files_encryption/tests/helper.php |   15 +++++++++-
 4 files changed, 64 insertions(+), 16 deletions(-)

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