[Pkg-owncloud-commits] [owncloud] 17/74: Merge pull request #12223 from owncloud/fix-unit-tests-s7

[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 74a625155daa2de1494a13d475e7b7ff92075ea1
Merge: 643835e a843129
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Nov 17 13:48:56 2014 +0100

    Merge pull request #12223 from owncloud/fix-unit-tests-s7
    
    Backport #12181

 tests/settings/controller/mailsettingscontrollertest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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