Merge "Avoid DBPerformance warnings in Category::initialize()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 3 Jun 2016 22:39:07 +0000 (22:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 3 Jun 2016 22:39:07 +0000 (22:39 +0000)

Trivial merge