[Pkg-owncloud-commits] [owncloud] 35/49: Merge pull request #6175 from owncloud/fix_6142

[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 4de8c4e5db0350034d9d53fb1dae76fc0b084373
Merge: 8dc3cb2 c67ece0
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Dec 4 02:54:07 2013 -0800

    Merge pull request #6175 from owncloud/fix_6142
    
    LDAP Wizard: make sure auto-detected suggestions are really applied initially, fixes #6142

 apps/user_ldap/ajax/testConfiguration.php |  2 ++
 apps/user_ldap/js/settings.js             | 59 +++++++++++++++++++++++++++++--
 apps/user_ldap/lib/configuration.php      |  2 +-
 apps/user_ldap/lib/wizard.php             |  3 +-
 4 files changed, 60 insertions(+), 6 deletions(-)

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