Merge "Convert CREDITS to single list of contributors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 10 Nov 2016 18:57:36 +0000 (18:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 10 Nov 2016 18:57:36 +0000 (18:57 +0000)

Trivial merge