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

[git at git.haskell.org]

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

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

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

commit d1416c372575d12c401d384d6f46ef1b1297301a
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Dec 18 03:34:42 2015 +0100

    Update .mailmap [skip ci]


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

d1416c372575d12c401d384d6f46ef1b1297301a
 .mailmap | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index fca1f62..4c52474 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,12 +27,14 @@ Austin Seipp            <austin at well-typed.com>             <as at hacks.yi.org>
 Austin Seipp            <austin at well-typed.com>             <as at nijoruj.org>
 Austin Seipp            <austin at well-typed.com>             <aseipp at pobox.com>
 Austin Seipp            <austin at well-typed.com>             <mad.one at gmail.com>
+Bartosz Nitka           <niteria at gmail.com>                 <bnitka at fb.com>
 Bas van Dijk            <v.dijk.bas at gmail.com>              basvandijk at home.nl <unknown>
 Bas van Dijk            <v.dijk.bas at gmail.com>              v.dijk.bas at gmail.com <unknown>
 Ben Chan                <usrbincc at yahoo.com>                # See Note [usrbincc].
 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 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>
@@ -80,6 +82,7 @@ David Waern             <davve at dtek.chalmers.se>            davve at dtek.chalmers.
 Dimitrios Vytiniotis    <dimitris at microsoft.com>
 Dimitrios Vytiniotis    <dimitris at microsoft.com>            <dimitris at MSRC-1361792.europe.corp.microsoft.com>
 Dimitrios Vytiniotis    <dimitris at microsoft.com>            dimitris at microsoft.com <unknown>
+Divam Narula            <dfordivam at gmail.com>               # https://www.linkedin.com/in/dfordivam
 Don Stewart             <dons at galois.com>                   <dons at cse.unsw.edu.au>
 Don Stewart             <dons at galois.com>                   dons <unknown>
 Don Stewart             <dons at galois.com>                   dons at cse.unsw.edu.au <unknown>
@@ -90,6 +93,7 @@ Duncan Coutts           <duncan at well-typed.com>             <duncan at community.ha
 Duncan Coutts           <duncan at well-typed.com>             <duncan at haskell.org>
 Edward Z. Yang          <ezyang at cs.stanford.edu>            <ezyang at mit.edu>
 Evan Hauck              <khyperia at live.com>
+Fumiaki Kinoshita       <fumiexcel at gmail.com>
 Gabor Pali              <pali.gabor at gmail.com>              <pgj at FreeBSD.org>
 Gabriele Keller         <keller at cse.unsw.edu.au>            keller <unknown>
 Gabriele Keller         <keller at cse.unsw.edu.au>            keller at .cse.unsw.edu.au <unknown>
@@ -162,9 +166,11 @@ Marc Weber              <marco-oweber at gmx.de>               marco-oweber at gmx.de
 Marcin 'Qrczak' Kowalczyk <qrczak at knm.org.pl>               qrczak <unknown>
 Marco Túlio Gontijo e Silva <marcot at marcot.eti.br>
 Marco Túlio Gontijo e Silva <marcot at marcot.eti.br>          <marcot at debian.org>
-Markus Großer           <markus.grosser at tum.de>
 Marios Titas            <redneb at gmx.com>                    <geopoul at gmail.com>
+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>
 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>
@@ -195,6 +201,8 @@ Rob Ennals              <rob at ennals.org>                    rje <unknown> # SPJ'
 Roman Leshchinskiy      <rl at cse.unsw.edu.au>                rl at cse.unsw.edu.au <unknown>
 Ross Paterson           <ross at soi.city.ac.uk>               ross <unknown>
 Ryan Lortie             <desrt at desrt.ca>                    desrt <unknown>
+Ryan Scott              <ryan.gl.scott at gmail.com>
+Ryan Scott              <ryan.gl.scott at gmail.com>           <ryan.gl.scott at ku.edu>
 Sam Anklesaria          <amsay at amsay.net>
 Sam Anklesaria          <amsay at amsay.net>                   amsay at amsay.net <unknown>
 Sean Seefried           <sean.seefried at gmail.com>           sseefried <unknown>
@@ -230,6 +238,7 @@ Stephen Blackheath      <stephen at blacksapphire.com>         <oversensitive.pasto
 Sungwoo Park            <gla at postech.ac.kr>                 gla <unknown> # https://ghc.haskell.org/trac/ghc/wiki/TeamGHC
 Sven Panne              <sven.panne at aedion.de>              panne <unknown>
 Sven Panne              <sven.panne at aedion.de>              sven.panne at aedion.de <unknown>
+Sylvain Henry           <hsyl20 at gmail.com>
 Sébastien Carlier       <sebc at posse42.net>                  sebc <unknown>
 Thorkil Naur            <naur at post11.tele.dk>               naur at post11.tele.dk <unknown>
 Tibor Erdesz            <erdeszt at gmail.com>