Merge "resourceloader: Optimise startup by merging regexes"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 3 Nov 2016 00:29:58 +0000 (00:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 3 Nov 2016 00:29:58 +0000 (00:29 +0000)

Trivial merge