Merge "Update .mailmap for the generation of CREDITS"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 16 Jan 2017 20:03:11 +0000 (20:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 16 Jan 2017 20:03:12 +0000 (20:03 +0000)

Trivial merge