Merge "Fix category column count regression"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 Apr 2015 18:03:02 +0000 (18:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Apr 2015 18:03:02 +0000 (18:03 +0000)

Trivial merge