[Pkg-owncloud-commits] [owncloud] 12/20: Merge pull request #17765 from owncloud/backport-17723-stable7

[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 3feccc9562a1d3bb7939577f576754540b5df54e
Merge: 6dfb2af a1815cf
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Jul 21 00:05:22 2015 +0200

    Merge pull request #17765 from owncloud/backport-17723-stable7
    
    Backport of #17723 to stable7

 apps/user_ldap/lib/user/manager.php   |   4 +-
 apps/user_ldap/tests/user/manager.php | 316 +++++++++++++++++-----------------
 2 files changed, 164 insertions(+), 156 deletions(-)

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