Merge "resourceloader: Add support for delivering templates"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 Oct 2014 20:58:57 +0000 (20:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Oct 2014 20:58:57 +0000 (20:58 +0000)

Trivial merge