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

[git at git.haskell.org]

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

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

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

commit 77ee3a92a4012530cbd0b63c7b10b544eae50754
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue May 17 19:33:01 2016 +0200

    Update .mailmap [skip ci]


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

77ee3a92a4012530cbd0b63c7b10b544eae50754
 .mailmap | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 81dec3d..cc3e031 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,7 +11,8 @@ Alexander Lukyanov      <alex.dontexist at gmail.com>          # Ticket #9360.
 Alexander Vershilov     <alexander.vershilov at gmail.com>     <alexander.vershilov at tweag.io>
 Alexey Rodriguez        <mrchebas at gmail.com>
 Alexey Rodriguez        <mrchebas at gmail.com>                mrchebas at gmail.com <unknown>
-Andrew Farmer           <afarmer at ittc.ku.edu>               <anfarmer at ku.edu>
+Andrew Farmer           <anfarmer at fb.com>                   <anfarmer at ku.edu>
+Andrew Farmer           <anfarmer at fb.com>                   <afarmer at ittc.ku.edu>
 Andrew Pimlott          <andrew.pimlott.ctr at metnet.navy.mil> andrew.pimlott.ctr at metnet.navy.mil <unknown>
 Andrew Tolmach          <apt at cs.pdx.edu>                    apt <unknown>
 André Santos            <alms at di.ufpe.br>                   andre <unknown>
@@ -75,7 +76,8 @@ David Himmelstrup       <lemmih at gmail.com>                  # http://www.haskell
 David M Peixotto        <dmp at rice.edu>                      dmp at rice.edu <unknown>
 David Terei             <code at davidterei.com>               <davidt at davidt-vm-32.scs.stanford.edu> # Ticket #5785.
 David Terei             <code at davidterei.com>               <davidterei at gmail.com>
-David Turner            <dnt at dcs.gla.ac.uk>                 dnt <unknown> # Same domain as Will Partain, who mentions "(from dnt)"
+David C. Turner         <dave.c.turner at gmail.com>
+David N. Turner         <dnt at dcs.gla.ac.uk>                 dnt <unknown> # Same domain as Will Partain, who mentions "(from dnt)"
 David Waern             <davve at dtek.chalmers.se>
 David Waern             <davve at dtek.chalmers.se>            <david.waern at gmail.com>
 David Waern             <davve at dtek.chalmers.se>            <waern at ubuntu.(none)>
@@ -182,6 +184,7 @@ Nathan Huesken          <nathan.huesken at posteo.de>
 Neil Mitchell           <ndmitchell at gmail.com>              <http://www.cs.york.ac.uk/~ndm/>
 Neil Mitchell           <ndmitchell at gmail.com>              Neil Mitchell <unknown>
 Nicholas Nethercote     <njn25 at cam.ac.uk>                   njn <unknown>
+Nikita Sazanovich       <nikitasazanovich at gmail.com>
 Niklas Larsson          <niklas at mm.st>                      # Commit 664063.
 Norman Ramsey           <nr at eecs.harvard.edu>               nr at eecs.harvard.edu <unknown>
 Orphi                   <MathematicalOrchid at hotmail.com>    # Uses this name online.
@@ -223,6 +226,7 @@ Simon Marlow            <marlowsd at gmail.com>                <smarlow at fb.com>
 Simon Marlow            <marlowsd at gmail.com>                simonm <unknown>
 Simon Marlow            <marlowsd at gmail.com>                simonmar <unknown>
 Simon Marlow            <marlowsd at gmail.com>                simonmar at microsoft.com <unknown>
+Simon Marlow            <marlowsd at gmail.com>                <smarlow at SIMONMARLOW-PC.TheFacebook.com>
 Simon Marlow            <marlowsd at gmail.com>                uid245 <unknown> # See Note [uid245]
 Simon Peyton Jones      <simonpj at microsoft.com>
 Simon Peyton Jones      <simonpj at microsoft.com>             <simonpj at .europe.corp.microsoft.com>
@@ -265,6 +269,7 @@ Yuri de Wit             <admin at rodlogic.net>                # Commit 37d64a.
 Yusuke Matsushita       <y.skm24t at gmail.com>                # https://github.com/Kinokkory
 Zejun Wu                <watashi at watashi.ws>                <zejun.wu at gmail.com>
 gwern                   <gwern0 at gmail.com>                  gwern0 at gmail.com <unknown> # Uses this name online.
+mniip                   <mniip at mniip.com>                   # Uses this name online.
 shelarcy                <shelarcy at gmail.com>                # Uses this name online.
 Ömer Sinan Ağacan       <omeragacan at gmail.com>              # https://github.com/osa1