Merge "Update CREDITS and .mailmap files"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 14 Mar 2017 15:09:56 +0000 (15:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 14 Mar 2017 15:09:57 +0000 (15:09 +0000)

Trivial merge