Merge "Update CREDITS and .mailmap" into REL1_31
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 18 Apr 2018 01:50:14 +0000 (01:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 18 Apr 2018 01:50:14 +0000 (01:50 +0000)

Trivial merge