Merge "resourceloader: Tidy up RL to simplify ResourceLoaderEditToolbarModule"

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

Mon, 28 Sep 2015 19:29:01 +0000 (19:29 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 28 Sep 2015 19:29:01 +0000 (19:29 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 28 Sep 2015 19:29:01 +0000 (19:29 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 28 Sep 2015 19:29:01 +0000 (19:29 +0000)
diff --cc RELEASE-NOTES-1.26
Simple merge
diff --cc includes/resourceloader/ResourceLoader.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 28 Sep 2015 19:29:01 +0000 (19:29 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 28 Sep 2015 19:29:01 +0000 (19:29 +0000)
		1	2
RELEASE-NOTES-1.26	patch \|	diff1 \|	diff2 \|	blob \| history
includes/resourceloader/ResourceLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history