Merge "Add `makeKey` and `makeGlobalKey` to BagOStuff"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 17 Oct 2015 01:06:12 +0000 (01:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 17 Oct 2015 01:06:12 +0000 (01:06 +0000)
1  2 
includes/GlobalFunctions.php
includes/objectcache/ObjectCache.php
tests/phpunit/includes/GlobalFunctions/GlobalTest.php

Simple merge
Simple merge