Merge "Config: Add Config and GlobalConfig classes"

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

Tue, 28 Jan 2014 05:15:26 +0000 (05:15 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 28 Jan 2014 05:15:26 +0000 (05:15 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 28 Jan 2014 05:15:26 +0000 (05:15 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Jan 2014 05:15:26 +0000 (05:15 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 28 Jan 2014 05:15:26 +0000 (05:15 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 28 Jan 2014 05:15:26 +0000 (05:15 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history