Merge "Refactor Statsd classes to enable null collector to work."

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

Tue, 30 May 2017 03:41:13 +0000 (03:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 30 May 2017 03:41:14 +0000 (03:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 30 May 2017 03:41:13 +0000 (03:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 30 May 2017 03:41:14 +0000 (03:41 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 30 May 2017 03:41:13 +0000 (03:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 30 May 2017 03:41:14 +0000 (03:41 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history