Merge "Count subject and talk page conflict separately"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 23 Jun 2016 15:38:46 +0000 (15:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 23 Jun 2016 15:38:46 +0000 (15:38 +0000)

Trivial merge