Merge "Fix undefined getDelimiter() call in sql.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 19 Sep 2016 23:49:02 +0000 (23:49 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 19 Sep 2016 23:49:02 +0000 (23:49 +0000)

Trivial merge