Merge "Allow preferences that need not be rendered in Special:Preferences"

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

Wed, 9 Jan 2013 07:57:37 +0000 (07:57 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 9 Jan 2013 07:57:37 +0000 (07:57 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 9 Jan 2013 07:57:37 +0000 (07:57 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 9 Jan 2013 07:57:37 +0000 (07:57 +0000)
diff --cc RELEASE-NOTES-1.21
Simple merge
diff --cc includes/AutoLoader.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 9 Jan 2013 07:57:37 +0000 (07:57 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 9 Jan 2013 07:57:37 +0000 (07:57 +0000)
		1	2
RELEASE-NOTES-1.21	patch \|	diff1 \|	diff2 \|	blob \| history
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history