2 Commits

Author	SHA1	Message	Date
Johannes Meyer	c288a68ed5	Merge branch 'master' into bugfix/drop-zend-config-7147 ... Conflicts: application/forms/LdapDiscoveryForm.php	2014-11-18 13:21:18 +01:00
Matthias Jentsch	5f8fcf4005	Fix Ldap server discovery ... Add a new connection member that stores whether settings were guessed or product of a discovery, move discovery methods into seperate class. fixes #7691	2014-11-18 09:45:54 +01:00