Merge "Avoid calling Block::deleteIfExpired() when not needed"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 5 Jan 2016 23:22:11 +0000 (23:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 5 Jan 2016 23:22:11 +0000 (23:22 +0000)

Trivial merge