Merge "Move inline $wgStatsdMetricPrefix default to DefaultSettings.php"

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

Mon, 14 Dec 2015 00:13:12 +0000 (00:13 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 14 Dec 2015 00:13:12 +0000 (00:13 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 14 Dec 2015 00:13:12 +0000 (00:13 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 14 Dec 2015 00:13:12 +0000 (00:13 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/context/RequestContext.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 14 Dec 2015 00:13:12 +0000 (00:13 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 14 Dec 2015 00:13:12 +0000 (00:13 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/context/RequestContext.php	patch \|	diff1 \|	diff2 \|	blob \| history