From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 21 Feb 2013 00:59:30 +0000 (+0000)
Subject: Merge "Fix how QUnit.newMwEnvironment merges live and custom settings"
X-Git-Tag: 1.31.0-rc.0~20617
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=f4e7488007e61b5f6e6566f79e5ce1db02b68e78;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix how QUnit.newMwEnvironment merges live and custom settings"
---

f4e7488007e61b5f6e6566f79e5ce1db02b68e78