Merge "[LockManager] Added timeout to the lock() function."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 2 Apr 2013 22:41:56 +0000 (22:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 2 Apr 2013 22:41:56 +0000 (22:41 +0000)

Trivial merge