Merge "SpecialTrackingCategories: Read from the extension registry"

author Kunal Mehta <legoktm@gmail.com>

Fri, 23 Jan 2015 19:09:21 +0000 (19:09 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 23 Jan 2015 19:09:21 +0000 (19:09 +0000)
author Kunal Mehta <legoktm@gmail.com>
Fri, 23 Jan 2015 19:09:21 +0000 (19:09 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Jan 2015 19:09:21 +0000 (19:09 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/registration/ExtensionProcessor.php
Simple merge
author	Kunal Mehta <legoktm@gmail.com>
	Fri, 23 Jan 2015 19:09:21 +0000 (19:09 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 23 Jan 2015 19:09:21 +0000 (19:09 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/registration/ExtensionProcessor.php	patch \|	diff1 \|	diff2 \|	blob \| history