Merge pull request #12984 from owncloud/ldap-user-cleanup-master

author Lukas Reschke <lukas@owncloud.com>

Fri, 9 Jan 2015 09:47:02 +0000 (10:47 +0100)

committer Lukas Reschke <lukas@owncloud.com>

Fri, 9 Jan 2015 09:47:02 +0000 (10:47 +0100)
author Lukas Reschke <lukas@owncloud.com>
Fri, 9 Jan 2015 09:47:02 +0000 (10:47 +0100)
committer Lukas Reschke <lukas@owncloud.com>
Fri, 9 Jan 2015 09:47:02 +0000 (10:47 +0100)
diff --cc apps/user_ldap/lib/access.php
Simple merge
diff --cc apps/user_ldap/lib/connection.php
Simple merge
diff --cc config/config.sample.php
Simple merge
author	Lukas Reschke <lukas@owncloud.com>
	Fri, 9 Jan 2015 09:47:02 +0000 (10:47 +0100)
committer	Lukas Reschke <lukas@owncloud.com>
	Fri, 9 Jan 2015 09:47:02 +0000 (10:47 +0100)
		1	2
apps/user_ldap/lib/access.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/user_ldap/lib/connection.php	patch \|	diff1 \|	diff2 \|	blob \| history
config/config.sample.php	patch \|	diff1 \|	diff2 \|	blob \| history