Merge "Add ParserFetchTemplate hook"

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

Tue, 15 Nov 2016 23:36:18 +0000 (23:36 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 15 Nov 2016 23:36:18 +0000 (23:36 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 Nov 2016 23:36:18 +0000 (23:36 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Nov 2016 23:36:18 +0000 (23:36 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/parser/Parser.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 15 Nov 2016 23:36:18 +0000 (23:36 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 15 Nov 2016 23:36:18 +0000 (23:36 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/Parser.php	patch \|	diff1 \|	diff2 \|	blob \| history