summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-07-10 17:05:08 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2015-07-10 17:05:08 +0200
commit888026dba01279dd6de5216856c81432836abaf1 (patch)
tree21096258e30bae82227d63558cfddd66c2ab078f
parent9e86bf1b346934e04ccc17ec50ea7e7d906f25e2 (diff)
downloadhaskell-888026dba01279dd6de5216856c81432836abaf1.tar.gz
Update .mailmap [skip ci]
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index ec555d5e97..fca1f62ff2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -162,6 +162,7 @@ Marc Weber <marco-oweber@gmx.de> marco-oweber@gmx.de
Marcin 'Qrczak' Kowalczyk <qrczak@knm.org.pl> qrczak <unknown>
Marco Túlio Gontijo e Silva <marcot@marcot.eti.br>
Marco Túlio Gontijo e Silva <marcot@marcot.eti.br> <marcot@debian.org>
+Markus Großer <markus.grosser@tum.de>
Marios Titas <redneb@gmx.com> <geopoul@gmail.com>
Matt Chapman <matthewc@cse.unsw.edu.au> matthewc <unknown>
Matthias Kilian <kili@outback.escape.de> kili@outback.escape.de <unknown>
@@ -231,6 +232,7 @@ Sven Panne <sven.panne@aedion.de> panne <unknown>
Sven Panne <sven.panne@aedion.de> sven.panne@aedion.de <unknown>
Sébastien Carlier <sebc@posse42.net> sebc <unknown>
Thorkil Naur <naur@post11.tele.dk> naur@post11.tele.dk <unknown>
+Tibor Erdesz <erdeszt@gmail.com>
Tim Chevalier <chevalier@alum.wellesley.edu>
Tim Chevalier <chevalier@alum.wellesley.edu> <t-kirstc@microsoft.com>
Tim Chevalier <chevalier@alum.wellesley.edu> krc <unknown> # Ticket #670.