Merge "Make non-exception rollback() calls safer"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Jul 2016 02:08:26 +0000 (02:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Jul 2016 02:08:26 +0000 (02:08 +0000)

Trivial merge