Merge pull request #15185 from eileenmcnaughton/dedupe10

author Eileen McNaughton <emcnaughton@wikimedia.org>

Mon, 2 Sep 2019 20:58:06 +0000 (08:58 +1200)

committer GitHub <noreply@github.com>

Mon, 2 Sep 2019 20:58:06 +0000 (08:58 +1200)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Mon, 2 Sep 2019 20:58:06 +0000 (08:58 +1200)
committer GitHub <noreply@github.com>
Mon, 2 Sep 2019 20:58:06 +0000 (08:58 +1200)
diff --cc CRM/Core/BAO/PrevNextCache.php
Simple merge
diff --cc tests/phpunit/CRM/Dedupe/MergerTest.php
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Mon, 2 Sep 2019 20:58:06 +0000 (08:58 +1200)
committer	GitHub <noreply@github.com>
	Mon, 2 Sep 2019 20:58:06 +0000 (08:58 +1200)
		1	2
CRM/Core/BAO/PrevNextCache.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRM/Dedupe/MergerTest.php	patch \|	diff1 \|	diff2 \|	blob \| history