Merge "Made the "bypassCache" flag for file locator methods use the master DB"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 5 Mar 2015 16:28:31 +0000 (16:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 5 Mar 2015 16:28:31 +0000 (16:28 +0000)
1  2 
includes/GlobalFunctions.php

Simple merge