Merge pull request #22102 from owncloud/ldap_2nddispname-master

author Thomas Müller <thomas.mueller@tmit.eu>

Sat, 6 Feb 2016 12:27:01 +0000 (13:27 +0100)

committer Thomas Müller <thomas.mueller@tmit.eu>

Sat, 6 Feb 2016 12:27:01 +0000 (13:27 +0100)
author Thomas Müller <thomas.mueller@tmit.eu>
Sat, 6 Feb 2016 12:27:01 +0000 (13:27 +0100)
committer Thomas Müller <thomas.mueller@tmit.eu>
Sat, 6 Feb 2016 12:27:01 +0000 (13:27 +0100)
diff --cc apps/user_ldap/js/wizard/wizardTabAdvanced.js
Simple merge
diff --cc apps/user_ldap/lib/configuration.php
Simple merge
diff --cc apps/user_ldap/templates/settings.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Sat, 6 Feb 2016 12:27:01 +0000 (13:27 +0100)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Sat, 6 Feb 2016 12:27:01 +0000 (13:27 +0100)
		1	2
apps/user_ldap/js/wizard/wizardTabAdvanced.js	patch \|	diff1 \|	diff2 \|	blob \| history
apps/user_ldap/lib/configuration.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/user_ldap/templates/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history