Merge "resourceloader: Add unit test for validateScriptFile()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Jun 2015 18:16:09 +0000 (18:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Jun 2015 18:16:09 +0000 (18:16 +0000)

Trivial merge