[Pkg-owncloud-commits] [owncloud] 28/85: Merge pull request #8692 from owncloud/fix_unit_tests_oc6

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 8429dde4d9df21cf399e07cdfd5a919483224bf1
Merge: 776d656 d17335d
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed May 28 17:44:40 2014 +0200

    Merge pull request #8692 from owncloud/fix_unit_tests_oc6
    
    fix failing unit tests on OC6

 apps/files_encryption/lib/keymanager.php | 4 ++--
 tests/lib/api.php                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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