Merge "Use mergeMwGlobalArrayValue in ApiOptionsTest"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 23 Oct 2014 17:55:51 +0000 (17:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 23 Oct 2014 17:55:51 +0000 (17:55 +0000)

Trivial merge