From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 29 Oct 2014 20:58:57 +0000 (+0000)
Subject: Merge "resourceloader: Add support for delivering templates"
X-Git-Tag: 1.31.0-rc.0~13450
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=d47c1e9230abd6b4002c95ca91c57a65900a21de;p=lhc%2Fweb%2Fwiklou.git

Merge "resourceloader: Add support for delivering templates"
---

d47c1e9230abd6b4002c95ca91c57a65900a21de