[Pkg-owncloud-commits] [owncloud] 68/78: Merge pull request #13742 from owncloud/fix-12190-2-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 55a122a9fecabc928162cab1346c22e3e7c86f70
Merge: 5014d2c ae850d7
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue May 26 16:06:21 2015 +0200

    Merge pull request #13742 from owncloud/fix-12190-2-stable7
    
    [backport #13740] backport #13740 to stable7

 apps/user_ldap/group_ldap.php       | 98 +++++++++++++++++++++++++++----------
 apps/user_ldap/lib/access.php       |  2 +-
 apps/user_ldap/lib/connection.php   |  3 ++
 apps/user_ldap/lib/wizard.php       | 14 +++++-
 apps/user_ldap/tests/group_ldap.php | 77 ++++++++++++++++++++++++++++-
 5 files changed, 164 insertions(+), 30 deletions(-)


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