Merge "Disable broken TemplateCategoriesTest unit test"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 20 May 2017 12:01:13 +0000 (12:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 20 May 2017 12:01:14 +0000 (12:01 +0000)

Trivial merge