Merge "Make content handlers assemble content for search"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Thu, 4 Aug 2016 15:54:36 +0000 (15:54 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 4 Aug 2016 15:54:36 +0000 (15:54 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Aug 2016 15:54:36 +0000 (15:54 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Aug 2016 15:54:36 +0000 (15:54 +0000)
diff --cc autoload.php
Simple merge
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/page/WikiPage.php
Simple merge
diff --cc tests/phpunit/MediaWikiTestCase.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 4 Aug 2016 15:54:36 +0000 (15:54 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 4 Aug 2016 15:54:36 +0000 (15:54 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/MediaWikiTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history