Merge ".mailmap, CREDITS: Correct Alexandre Emsenhuber's (IAlex) name"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 21 Nov 2016 20:43:41 +0000 (20:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 21 Nov 2016 20:43:41 +0000 (20:43 +0000)

Trivial merge