Merge "API: Restore ability for dieStatus() to be passed a non-fatal Status"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Jun 2017 23:25:34 +0000 (23:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Jun 2017 23:25:35 +0000 (23:25 +0000)

Trivial merge