[commit: ghc] master: Update .mailmap [skip ci] (c7d84d2)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c7d84d2603c1988125feaab54e0d776974e46f75/ghc

>---------------------------------------------------------------

commit c7d84d2603c1988125feaab54e0d776974e46f75
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Dec 19 11:41:44 2015 +0100

    Update .mailmap [skip ci]


>---------------------------------------------------------------

c7d84d2603c1988125feaab54e0d776974e46f75
 .mailmap | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 4c52474..5ea062b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -35,6 +35,7 @@ Ben Gamari              <bgamari.foss at gmail.com>            <ben at panda.(none)>
 Ben Gamari              <bgamari.foss at gmail.com>            <ben at panda1.milkyway>
 Ben Gamari              <bgamari.foss at gmail.com>            <ben at smart-cactus.org>
 Ben Gamari              <bgamari.foss at gmail.com>            <ben at well-typed.com>
+Ben Gamari              <bgamari.foss at gmail.com>            <bgamari at smart-cactus.org>
 Ben Lippmeier           <benl at ouroborus.net>
 Ben Lippmeier           <benl at ouroborus.net>                <Ben.Lippmeier at anu.edu.au>
 Ben Lippmeier           <benl at ouroborus.net>                Ben.Lippmeier.anu.edu.au <unknown>
@@ -63,7 +64,7 @@ Colin Watson            <cjwatson at debian.org>               <cjwatson at canonical.
 Csernik Flaviu Andrei   <fcsernik at gmail.com>                # https://github.com/archblob
 Daan Leijen             <daan at microsoft.com>                daan <unknown>
 Dan Licata              <drl at cs.cmu.edu>                    # Commit 6a05ec.
-Dana N. Xu              <na.xu at inria.fr>                    <nx200 at cad> # TODO. Doesn't work (weird char?).
+Dana N. Xu              <na.xu at inria.fr>                    <nx200 at cam.a.cuk[3~d> # Weird characters.
 Dana N. Xu              <na.xu at inria.fr>                    <nx200 at cam.ac.uk> # "Static Contract Checking for Haskell".
 Dana N. Xu              <na.xu at inria.fr>                    nx <unknown>
 Daniel Fischer          <daniel.is.fischer at googlemail.com>  <daniel.is.fischer at web.de>
@@ -171,6 +172,7 @@ Markus Großer           <markus.grosser at tum.de>
 Matt Chapman            <matthewc at cse.unsw.edu.au>          matthewc <unknown>
 Matthew Farkas-Dyck     <strake888 at gmail.com>
 Matthew Farkas-Dyck     <strake888 at gmail.com>               <mfdyck at google.com>
+Matthew Hyatt           <matthewnhyatt at gmail.com>
 Matthias Kilian         <kili at outback.escape.de>            kili at outback.escape.de <unknown>
 Michael D. Adams        <t-madams at microsoft.com>            <adamsmd at cs.indiana.edu>
 Michael Weber           <michaelw at debian.org>               michaelw <unknown>