Merge "Made $timeout in BagOStuff::lock() actually work"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 20 Nov 2014 09:39:41 +0000 (09:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 20 Nov 2014 09:39:41 +0000 (09:39 +0000)

Trivial merge