[Pkg-owncloud-commits] [owncloud] 13/134: Merge pull request #7464 from owncloud/enc_fseek_fallback_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 722b81627c302f24c714f297878722a10496a444
Merge: 7e2659f 9cff832
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue Mar 4 12:53:08 2014 +0100

    Merge pull request #7464 from owncloud/enc_fseek_fallback_stable6
    
    Enc fseek fallback stable6

 apps/files_encryption/lib/helper.php   | 24 +++++++++++++++++++++
 apps/files_encryption/lib/stream.php   | 38 +++++++++++++++++++++++++++------
 apps/files_encryption/lib/util.php     | 33 +++++++++++++++++++++++++---
 apps/files_encryption/tests/stream.php | 39 ++++++++++++++++++++++++++++++++++
 apps/files_encryption/tests/util.php   | 35 ++++++++++++++++++++++++++++++
 5 files changed, 159 insertions(+), 10 deletions(-)


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