Merge "Avoid the use of DB rollback() in LocalFileDeleteBatch"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Jul 2016 05:34:20 +0000 (05:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Jul 2016 05:34:20 +0000 (05:34 +0000)

Trivial merge