[Pkg-owncloud-commits] [owncloud] 33/44: Merge pull request #7462 from owncloud/ldap_proxy_access

[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 7534fae9bcaf074f4baaa5c95562ac1f3cb008ef
Merge: 68a9cea 470a0ad
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Feb 28 21:51:37 2014 +0100

    Merge pull request #7462 from owncloud/ldap_proxy_access
    
    Ldap proxy access

 apps/user_ldap/user_proxy.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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