Merge "RequestContext: Load the request object for getRequest on first call"

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

Wed, 6 Jan 2016 19:10:15 +0000 (19:10 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 6 Jan 2016 19:10:15 +0000 (19:10 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 6 Jan 2016 19:10:15 +0000 (19:10 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 6 Jan 2016 19:10:15 +0000 (19:10 +0000)
diff --cc includes/Setup.php
Simple merge
diff --cc includes/context/RequestContext.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 6 Jan 2016 19:10:15 +0000 (19:10 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 6 Jan 2016 19:10:15 +0000 (19:10 +0000)
		1	2
includes/Setup.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/context/RequestContext.php	patch \|	diff1 \|	diff2 \|	blob \| history