Merge "Allow server selection when running sql.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 7 Jun 2013 18:28:12 +0000 (18:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 7 Jun 2013 18:28:12 +0000 (18:28 +0000)

Trivial merge