Merge "[LockManager] Added support for a default lock manager."
authorHashar <hashar@free.fr>
Mon, 25 Jun 2012 22:57:45 +0000 (22:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 25 Jun 2012 22:57:45 +0000 (22:57 +0000)

Trivial merge