Merge "Increase QUnit.config.testTimeout to 30s"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 15 Nov 2014 16:44:39 +0000 (16:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 15 Nov 2014 16:44:39 +0000 (16:44 +0000)

Trivial merge