Typofix.
[ghc.git] / .mailmap
index 4c52474..cc3e031 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -11,7 +11,8 @@ Alexander Lukyanov      <alex.dontexist@gmail.com>          # Ticket #9360.
 Alexander Vershilov     <alexander.vershilov@gmail.com>     <alexander.vershilov@tweag.io>
 Alexey Rodriguez        <mrchebas@gmail.com>
 Alexey Rodriguez        <mrchebas@gmail.com>                mrchebas@gmail.com <unknown>
-Andrew Farmer           <afarmer@ittc.ku.edu>               <anfarmer@ku.edu>
+Andrew Farmer           <anfarmer@fb.com>                   <anfarmer@ku.edu>
+Andrew Farmer           <anfarmer@fb.com>                   <afarmer@ittc.ku.edu>
 Andrew Pimlott          <andrew.pimlott.ctr@metnet.navy.mil> andrew.pimlott.ctr@metnet.navy.mil <unknown>
 Andrew Tolmach          <apt@cs.pdx.edu>                    apt <unknown>
 André Santos            <alms@di.ufpe.br>                   andre <unknown>
@@ -35,6 +36,7 @@ Ben Gamari              <bgamari.foss@gmail.com>            <ben@panda.(none)>
 Ben Gamari              <bgamari.foss@gmail.com>            <ben@panda1.milkyway>
 Ben Gamari              <bgamari.foss@gmail.com>            <ben@smart-cactus.org>
 Ben Gamari              <bgamari.foss@gmail.com>            <ben@well-typed.com>
+Ben Gamari              <bgamari.foss@gmail.com>            <bgamari@smart-cactus.org>
 Ben Lippmeier           <benl@ouroborus.net>
 Ben Lippmeier           <benl@ouroborus.net>                <Ben.Lippmeier@anu.edu.au>
 Ben Lippmeier           <benl@ouroborus.net>                Ben.Lippmeier.anu.edu.au <unknown>
@@ -63,7 +65,7 @@ Colin Watson            <cjwatson@debian.org>               <cjwatson@canonical.
 Csernik Flaviu Andrei   <fcsernik@gmail.com>                # https://github.com/archblob
 Daan Leijen             <daan@microsoft.com>                daan <unknown>
 Dan Licata              <drl@cs.cmu.edu>                    # Commit 6a05ec.
-Dana N. Xu              <na.xu@inria.fr>                    <nx200@cad> # TODO. Doesn't work (weird char?).
+Dana N. Xu              <na.xu@inria.fr>                    <nx200@cam.a.cuk\b\b\b\e[3~\b\b\b\b\e[Dd> # Weird characters.
 Dana N. Xu              <na.xu@inria.fr>                    <nx200@cam.ac.uk> # "Static Contract Checking for Haskell".
 Dana N. Xu              <na.xu@inria.fr>                    nx <unknown>
 Daniel Fischer          <daniel.is.fischer@googlemail.com>  <daniel.is.fischer@web.de>
@@ -74,7 +76,8 @@ David Himmelstrup       <lemmih@gmail.com>                  # http://www.haskell
 David M Peixotto        <dmp@rice.edu>                      dmp@rice.edu <unknown>
 David Terei             <code@davidterei.com>               <davidt@davidt-vm-32.scs.stanford.edu> # Ticket #5785.
 David Terei             <code@davidterei.com>               <davidterei@gmail.com>
-David Turner            <dnt@dcs.gla.ac.uk>                 dnt <unknown> # Same domain as Will Partain, who mentions "(from dnt)"
+David C. Turner         <dave.c.turner@gmail.com>
+David N. Turner         <dnt@dcs.gla.ac.uk>                 dnt <unknown> # Same domain as Will Partain, who mentions "(from dnt)"
 David Waern             <davve@dtek.chalmers.se>
 David Waern             <davve@dtek.chalmers.se>            <david.waern@gmail.com>
 David Waern             <davve@dtek.chalmers.se>            <waern@ubuntu.(none)>
@@ -171,6 +174,7 @@ Markus Großer           <markus.grosser@tum.de>
 Matt Chapman            <matthewc@cse.unsw.edu.au>          matthewc <unknown>
 Matthew Farkas-Dyck     <strake888@gmail.com>
 Matthew Farkas-Dyck     <strake888@gmail.com>               <mfdyck@google.com>
+Matthew Hyatt           <matthewnhyatt@gmail.com>
 Matthias Kilian         <kili@outback.escape.de>            kili@outback.escape.de <unknown>
 Michael D. Adams        <t-madams@microsoft.com>            <adamsmd@cs.indiana.edu>
 Michael Weber           <michaelw@debian.org>               michaelw <unknown>
@@ -180,6 +184,7 @@ Nathan Huesken          <nathan.huesken@posteo.de>
 Neil Mitchell           <ndmitchell@gmail.com>              <http://www.cs.york.ac.uk/~ndm/>
 Neil Mitchell           <ndmitchell@gmail.com>              Neil Mitchell <unknown>
 Nicholas Nethercote     <njn25@cam.ac.uk>                   njn <unknown>
+Nikita Sazanovich       <nikitasazanovich@gmail.com>
 Niklas Larsson          <niklas@mm.st>                      # Commit 664063.
 Norman Ramsey           <nr@eecs.harvard.edu>               nr@eecs.harvard.edu <unknown>
 Orphi                   <MathematicalOrchid@hotmail.com>    # Uses this name online.
@@ -221,6 +226,7 @@ Simon Marlow            <marlowsd@gmail.com>                <smarlow@fb.com>
 Simon Marlow            <marlowsd@gmail.com>                simonm <unknown>
 Simon Marlow            <marlowsd@gmail.com>                simonmar <unknown>
 Simon Marlow            <marlowsd@gmail.com>                simonmar@microsoft.com <unknown>
+Simon Marlow            <marlowsd@gmail.com>                <smarlow@SIMONMARLOW-PC.TheFacebook.com>
 Simon Marlow            <marlowsd@gmail.com>                uid245 <unknown> # See Note [uid245]
 Simon Peyton Jones      <simonpj@microsoft.com>
 Simon Peyton Jones      <simonpj@microsoft.com>             <simonpj@.europe.corp.microsoft.com>
@@ -240,6 +246,7 @@ Sven Panne              <sven.panne@aedion.de>              panne <unknown>
 Sven Panne              <sven.panne@aedion.de>              sven.panne@aedion.de <unknown>
 Sylvain Henry           <hsyl20@gmail.com>
 Sébastien Carlier       <sebc@posse42.net>                  sebc <unknown>
+Takano Akio             <tak@anoak.io>                      <aljee@hyper.cx>
 Thorkil Naur            <naur@post11.tele.dk>               naur@post11.tele.dk <unknown>
 Tibor Erdesz            <erdeszt@gmail.com>
 Tim Chevalier           <chevalier@alum.wellesley.edu>
@@ -262,6 +269,7 @@ Yuri de Wit             <admin@rodlogic.net>                # Commit 37d64a.
 Yusuke Matsushita       <y.skm24t@gmail.com>                # https://github.com/Kinokkory
 Zejun Wu                <watashi@watashi.ws>                <zejun.wu@gmail.com>
 gwern                   <gwern0@gmail.com>                  gwern0@gmail.com <unknown> # Uses this name online.
+mniip                   <mniip@mniip.com>                   # Uses this name online.
 shelarcy                <shelarcy@gmail.com>                # Uses this name online.
 Ömer Sinan Ağacan       <omeragacan@gmail.com>              # https://github.com/osa1