[Pkg-owncloud-commits] [owncloud] 79/145: Merge pull request #7081 from owncloud/fix_6670

[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 fd32501fe05bfecbdb2d5db4f95c4c828dbe474f
Merge: 5e31549 a967ace
Author: blizzz <blizzz at owncloud.com>
Date:   Mon Feb 10 11:27:31 2014 +0100

    Merge pull request #7081 from owncloud/fix_6670
    
    LDAP: Wizard cannot determine Base DN in some cases, fixes #6670

 apps/user_ldap/js/settings.js       | 1 +
 apps/user_ldap/lib/access.php       | 2 +-
 apps/user_ldap/lib/ildapwrapper.php | 4 +++-
 apps/user_ldap/lib/ldap.php         | 6 +++---
 apps/user_ldap/lib/wizard.php       | 5 +++++
 5 files changed, 13 insertions(+), 5 deletions(-)

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