Merge "Use wgResourceBasePath instead of wgScriptPath for wgStylePath etc."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 1 Sep 2015 21:55:31 +0000 (21:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 1 Sep 2015 21:55:31 +0000 (21:55 +0000)

Trivial merge