Merge "Fix sql.php --json behavior"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 17 Dec 2018 13:26:21 +0000 (13:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 17 Dec 2018 13:26:21 +0000 (13:26 +0000)

Trivial merge