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

[git at git.haskell.org]

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

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

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

commit 888026dba01279dd6de5216856c81432836abaf1
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Jul 10 17:05:08 2015 +0200

    Update .mailmap [skip ci]


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

888026dba01279dd6de5216856c81432836abaf1
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index ec555d5..fca1f62 100644
--- a/.mailmap
+++ b/.mailmap
@@ -162,6 +162,7 @@ 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>
 Matt Chapman            <matthewc at cse.unsw.edu.au>          matthewc <unknown>
 Matthias Kilian         <kili at outback.escape.de>            kili at outback.escape.de <unknown>
@@ -231,6 +232,7 @@ Sven Panne              <sven.panne at aedion.de>              panne <unknown>
 Sven Panne              <sven.panne at aedion.de>              sven.panne at aedion.de <unknown>
 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>
 Tim Chevalier           <chevalier at alum.wellesley.edu>
 Tim Chevalier           <chevalier at alum.wellesley.edu>      <t-kirstc at microsoft.com>
 Tim Chevalier           <chevalier at alum.wellesley.edu>      krc <unknown> # Ticket #670.