[Pkg-owncloud-commits] [owncloud] 31/36: Merge pull request #17034 from owncloud/backport-16890-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 e2b486eab6e6e77b73d405853e19136b82ea83d0
Merge: b1fc1b2 0766a67
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Jun 23 16:32:21 2015 +0200

    Merge pull request #17034 from owncloud/backport-16890-stable7
    
    Backport of #16890 to stable7

 apps/user_ldap/tests/user_ldap.php |  4 ++++
 apps/user_ldap/user_ldap.php       | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

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