Merge "Provide a ResourceLoader module for language names"

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

Wed, 30 Apr 2014 23:32:43 +0000 (23:32 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 30 Apr 2014 23:32:43 +0000 (23:32 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Apr 2014 23:32:43 +0000 (23:32 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 30 Apr 2014 23:32:43 +0000 (23:32 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 30 Apr 2014 23:32:43 +0000 (23:32 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 30 Apr 2014 23:32:43 +0000 (23:32 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history