Merge "Avoid scoped lock errors in Category::refreshCounts() due to nesting"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 2 Jun 2017 23:28:02 +0000 (23:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 2 Jun 2017 23:28:03 +0000 (23:28 +0000)

Trivial merge