Merge "Catch rollback exceptions in API exception handling"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 6 Apr 2015 17:35:42 +0000 (17:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 6 Apr 2015 17:35:42 +0000 (17:35 +0000)

Trivial merge