Merge "ResourceLoader: Honor $wgAllow* settings in site/user modules"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Apr 2013 23:55:13 +0000 (23:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Apr 2013 23:55:13 +0000 (23:55 +0000)

Trivial merge