Merge "Followup 1cf5a6e: use $wgResourceBasePath to refer to resources/assets, not...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 17 Sep 2014 23:33:55 +0000 (23:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 17 Sep 2014 23:33:56 +0000 (23:33 +0000)

Trivial merge