Merge "[LockManager] Refactoring to allow proper cross-wiki support."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Jan 2013 21:26:10 +0000 (21:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 30 Jan 2013 21:26:10 +0000 (21:26 +0000)

Trivial merge