Merge "Begin exposing SiteConfiguration via site contexts"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 9 Dec 2013 12:28:51 +0000 (12:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 9 Dec 2013 12:28:51 +0000 (12:28 +0000)
1  2 
includes/context/ContextSource.php
includes/context/DerivativeContext.php
includes/context/RequestContext.php

Simple merge
Simple merge