Merge "Removed $wgAntiLockFlags to unify the code paths"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 3 Oct 2014 17:55:11 +0000 (17:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 3 Oct 2014 17:55:11 +0000 (17:55 +0000)

Trivial merge