Merge "Further improve load order of RC and watchlist styling"

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

Thu, 27 Jun 2013 09:49:08 +0000 (09:49 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 27 Jun 2013 09:49:08 +0000 (09:49 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 27 Jun 2013 09:49:08 +0000 (09:49 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 27 Jun 2013 09:49:08 +0000 (09:49 +0000)
diff --cc includes/ChangesList.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 27 Jun 2013 09:49:08 +0000 (09:49 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 27 Jun 2013 09:49:08 +0000 (09:49 +0000)
		1	2
includes/ChangesList.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history