Merge "resourceloader: Add support for variables in WikiModule"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Jun 2016 14:06:09 +0000 (14:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Jun 2016 14:06:09 +0000 (14:06 +0000)

Trivial merge