Merge "Introduce top level service locator."

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

Sun, 3 Apr 2016 07:26:31 +0000 (07:26 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 3 Apr 2016 07:26:31 +0000 (07:26 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 3 Apr 2016 07:26:31 +0000 (07:26 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 3 Apr 2016 07:26:31 +0000 (07:26 +0000)
diff --cc autoload.php
Simple merge
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sun, 3 Apr 2016 07:26:31 +0000 (07:26 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 3 Apr 2016 07:26:31 +0000 (07:26 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history