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

[git at git.haskell.org]

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

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

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

commit 392cec4da9a7ce2b5c89ac688a5b9844a543c909
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Tue Feb 14 16:15:55 2017 +0000

    Update .mailmap [skip ci]


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

392cec4da9a7ce2b5c89ac688a5b9844a543c909
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 5cfc6c4..c4a93de 100644
--- a/.mailmap
+++ b/.mailmap
@@ -224,6 +224,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>
+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>
 Simon Hengel            <sol at typeful.net>                   <simon.hengel at wiktory.org>
@@ -267,6 +268,7 @@ Tim Harris              <tharris at microsoft.com>             tharris <unknown>
 Tim Harris              <tharris at microsoft.com>             tharris at microsoft.com <unknown>
 Tobias Gedell           <d99getob at dtek.chalmers.se>         tgedell <unknown>
 Tom Schrijvers          <tom.schrijvers at cs.kuleuven.be>     tom.schrijvers at cs.kuleuven.be <unknown>
+Tom Murphy              <vivid.haskell at gmail.com>
 Umut Acar               <umut at cs.cmu.edu>                   umuta <unknown> # POPL 2002 paper Adaptive Functional Programming
 Vitaly Bragilevsky      <bravit111 at gmail.com>
 Volker Stolz            <stolz at i2.informatik.rwth-aachen.de>