Merge "maintenance: Add --query option in sql.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 18 Jul 2015 21:29:51 +0000 (21:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 18 Jul 2015 21:29:51 +0000 (21:29 +0000)

Trivial merge