[Pkg-owncloud-commits] [owncloud] 63/69: Merge pull request #20446 from owncloud/backport-20093+20124-stable8.2

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 344738118640f55c5a4fb680821a5654c38c8569
Merge: febfa83 1721916
Author: C. Montero Luque <cmonteroluque at users.noreply.github.com>
Date:   Tue Nov 10 18:54:37 2015 +0100

    Merge pull request #20446 from owncloud/backport-20093+20124-stable8.2
    
    [stable8.2] [Backport] of #20093 and #20124

 apps/user_ldap/group_ldap.php      |  5 +++--
 apps/user_ldap/lib/access.php      |  2 +-
 apps/user_ldap/lib/user/user.php   |  6 +++---
 apps/user_ldap/tests/access.php    | 16 +++++++++++++---
 apps/user_ldap/tests/user/user.php | 39 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 9 deletions(-)

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