Merge "Fix how QUnit.newMwEnvironment merges live and custom settings"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 21 Feb 2013 00:59:30 +0000 (00:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 21 Feb 2013 00:59:30 +0000 (00:59 +0000)

Trivial merge