Merge "sql.php: Provide --json output mode"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 21 Feb 2018 21:14:19 +0000 (21:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 21 Feb 2018 21:14:19 +0000 (21:14 +0000)

Trivial merge