Merge "Guard Database::explicitTrxActive() against returning false while in begin()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 11 Oct 2016 23:18:45 +0000 (23:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 11 Oct 2016 23:18:45 +0000 (23:18 +0000)

Trivial merge