Merge "Use canonical class name, remove unused globals."

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

Wed, 4 Sep 2013 17:55:34 +0000 (17:55 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 4 Sep 2013 17:55:34 +0000 (17:55 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 4 Sep 2013 17:55:34 +0000 (17:55 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 4 Sep 2013 17:55:34 +0000 (17:55 +0000)
diff --cc includes/SkinTemplate.php
Simple merge
diff --cc includes/specials/SpecialListfiles.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 4 Sep 2013 17:55:34 +0000 (17:55 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 4 Sep 2013 17:55:34 +0000 (17:55 +0000)
		1	2
includes/SkinTemplate.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialListfiles.php	patch \|	diff1 \|	diff2 \|	blob \| history