Merge "resources: Load OOjs UI from its four parts"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Feb 2016 21:38:34 +0000 (21:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Feb 2016 21:38:34 +0000 (21:38 +0000)

Trivial merge