Merge "Added ObjectCache::getMainStashInstance() and $wgMainStash"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 19 May 2015 07:44:44 +0000 (07:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 19 May 2015 07:44:44 +0000 (07:44 +0000)

Trivial merge