Merge "Reduce change for deadlocks in Block::insert()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 17 Apr 2015 20:21:18 +0000 (20:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 17 Apr 2015 20:21:18 +0000 (20:21 +0000)

Trivial merge