Merge "includes/resourceloader/: Use Config instead of globals"

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

Fri, 8 Aug 2014 17:25:42 +0000 (17:25 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 8 Aug 2014 17:25:42 +0000 (17:25 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 8 Aug 2014 17:25:42 +0000 (17:25 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 8 Aug 2014 17:25:42 +0000 (17:25 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/resourceloader/ResourceLoaderFileModule.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 8 Aug 2014 17:25:42 +0000 (17:25 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 8 Aug 2014 17:25:42 +0000 (17:25 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/resourceloader/ResourceLoaderFileModule.php	patch \|	diff1 \|	diff2 \|	blob \| history