Merge pull request #584 from wardragon/ldap_access_userExists_fix

author blizzz <blizzz@owncloud.com>

Thu, 13 Dec 2012 00:59:43 +0000 (16:59 -0800)

committer blizzz <blizzz@owncloud.com>

Thu, 13 Dec 2012 00:59:43 +0000 (16:59 -0800)
author blizzz <blizzz@owncloud.com>
Thu, 13 Dec 2012 00:59:43 +0000 (16:59 -0800)
committer blizzz <blizzz@owncloud.com>
Thu, 13 Dec 2012 00:59:43 +0000 (16:59 -0800)
diff --cc apps/user_ldap/lib/access.php
Simple merge
diff --cc lib/user.php
Simple merge
author	blizzz <blizzz@owncloud.com>
	Thu, 13 Dec 2012 00:59:43 +0000 (16:59 -0800)
committer	blizzz <blizzz@owncloud.com>
	Thu, 13 Dec 2012 00:59:43 +0000 (16:59 -0800)
		1	2
apps/user_ldap/lib/access.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/user.php	patch \|	diff1 \|	diff2 \|	blob \| history