Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup

author blizzz <blizzz@owncloud.com>

Fri, 17 Oct 2014 10:07:27 +0000 (12:07 +0200)

committer blizzz <blizzz@owncloud.com>

Fri, 17 Oct 2014 10:07:27 +0000 (12:07 +0200)
author blizzz <blizzz@owncloud.com>
Fri, 17 Oct 2014 10:07:27 +0000 (12:07 +0200)
committer blizzz <blizzz@owncloud.com>
Fri, 17 Oct 2014 10:07:27 +0000 (12:07 +0200)
diff --cc lib/private/group/manager.php
Simple merge
diff --cc tests/lib/group/manager.php
Simple merge
author	blizzz <blizzz@owncloud.com>
	Fri, 17 Oct 2014 10:07:27 +0000 (12:07 +0200)
committer	blizzz <blizzz@owncloud.com>
	Fri, 17 Oct 2014 10:07:27 +0000 (12:07 +0200)
		1	2
lib/private/group/manager.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/lib/group/manager.php	patch \|	diff1 \|	diff2 \|	blob \| history