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

[git at git.haskell.org]

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

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

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

commit cd9c7094756e5f479afd718b08b2d82d6b78e6f0
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Mon Mar 6 22:43:44 2017 +0000

    Update .mailmap [skip ci]


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

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

diff --git a/.mailmap b/.mailmap
index c4a93de..ed78978 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,6 +12,7 @@ Alexander Vershilov     <alexander.vershilov at gmail.com>     <alexander.vershilov
 Alexey Rodriguez        <mrchebas at gmail.com>
 Alexey Rodriguez        <mrchebas at gmail.com>                mrchebas at gmail.com <unknown>
 Alex Biehl              <alex.biehl at gmail.com>
+Alex Biehl              <alex.biehl at gmail.com>              <alexbiehl at gmail.com>
 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>
@@ -97,6 +98,7 @@ Duncan Coutts           <duncan at well-typed.com>             <duncan.coutts at worc.
 Duncan Coutts           <duncan at well-typed.com>             <duncan at community.haskell.org>
 Duncan Coutts           <duncan at well-typed.com>             <duncan at haskell.org>
 Edward Z. Yang          <ezyang at cs.stanford.edu>            <ezyang at mit.edu>
+Eric Seidel             <eric at seidel.io>                    <gridaphobe at gmail.com>
 Erik de Castro Lopo     <erik.decastrolopo at ambiata.com>     <erikd at mega-nerd.com>
 Evan Hauck              <khyperia at live.com>
 Fumiaki Kinoshita       <fumiexcel at gmail.com>
@@ -147,6 +149,7 @@ Jost Berthold           <jb.diku at gmail.com>                 berthold at mathematik.
 Juan J. Quintela        <quintela at fi.udc.es>                quintela <unknown>
 Judah Jacobson          <judah.jacobson at gmail.com>          judah.jacobson at gmail.com <unknown>
 Julian Seward           <jseward at acm.org>                   sewardj <unknown>
+Julie Moronuki          <jdog74 at gmail.com>
 Karel Gardas            <karel.gardas at centrum.cz>           <karel.gardas at centrumcz>
 Karel Gardas            <karel.gardas at centrum.cz>           <kgardas at objectsecurity.com>
 Keith Wansbrough        <keith.wansbrough at cl.cam.ac.uk>     keithw <unknown>
@@ -202,8 +205,9 @@ Pepe Iborra             <mnislaih at gmail.com>                pepe <unknown>
 Pepe Iborra             <mnislaih at gmail.com>                pepeiborra at gmail.com <unknown>
 Peter Jonsson           <t-peterj at microsoft.com>            t-peterj at microsoft.com <unknown>
 Peter Trommler          <ptrommler at acm.org>                 <ptrommler at scm.org>
-Peter Wortmann          <scpmw at leeds.ac.uk>                 <peter at grayson-heights-pc028-118.student-halls.leeds.ac.uk>
-Peter Wortmann          <scpmw at leeds.ac.uk>                 scpmw at leeds.ac.uk <unknown>
+Peter Wortmann          <Peter.Wortmann at googlemail.com>     <scpmw at leeds.ac.uk>
+Peter Wortmann          <Peter.Wortmann at googlemail.com>     <peter at grayson-heights-pc028-118.student-halls.leeds.ac.uk>
+Peter Wortmann          <Peter.Wortmann at googlemail.com>     scpmw at leeds.ac.uk <unknown>
 Ralf Laemmel            <softlang at uni-koblenz.de>           ralf <unknown> # https://ghc.haskell.org/trac/ghc/wiki/TeamGHC
 Ravi Nanavati           <ravi at bluespec.com>                 # Commit 70c044.
 Reuben Thomas           <rrt at sc3d.org>                      rrt <unknown>
@@ -224,6 +228,7 @@ Sergei Trofimovich      <slyfox at gentoo.org>                 <slyfox at gentoo.or
 Sergei Trofimovich      <slyfox at gentoo.org>                 <slyfox at community.haskell.org>
 Sergei Trofimovich      <slyfox at gentoo.org>                 <slyfox at inbox.ru>
 Shae Matijs Erisson     <shae at ScannedInAvian.com>           shae at ScannedInAvian.com <unknown>
+Siddhanathan Shanmugam  <siddhanathan at gmail.com>            <siddhanathan+social at gmail.com>
 Siddharth Bhat          <siddu.druid at gmail.com>
 Sigbjorn Finne          <sof at galois.com>                    sof <unknown>
 Sigbjorn Finne          <sof at galois.com>                    sof at galois.com <unknown>