Merge "qunit: Increase individual test timeout to 60 seconds"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Feb 2016 18:15:55 +0000 (18:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Feb 2016 18:15:55 +0000 (18:15 +0000)

Trivial merge