[Pkg-owncloud-commits] [owncloud] 22/104: Merge pull request #6498 from owncloud/stable6-oracleencryptiontestfix

[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 c4c972fd2fd25a8f83f785f8fba8d98ce3e5041a
Merge: 6de259e 1f93b4e
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Dec 19 06:45:37 2013 -0800

    Merge pull request #6498 from owncloud/stable6-oracleencryptiontestfix
    
    [stable6] Trying to fix failing encryption tests on Oracle

 apps/files_encryption/lib/util.php | 46 ++++++++++++++------------------------
 apps/files_sharing/tests/base.php  |  4 ++--
 2 files changed, 19 insertions(+), 31 deletions(-)


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