Merge "resourceloader: Remove 'loaderScripts' option from FileModule"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 28 Oct 2015 14:53:37 +0000 (14:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 28 Oct 2015 14:53:37 +0000 (14:53 +0000)

Trivial merge