Merge "resourceloader: Allow modules to be registered via a factory callback"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 21 May 2017 17:28:31 +0000 (17:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 21 May 2017 17:28:32 +0000 (17:28 +0000)

Trivial merge