From 888026dba01279dd6de5216856c81432836abaf1 Mon Sep 17 00:00:00 2001
From: Thomas Miedema <thomasmiedema@gmail.com>
Date: Fri, 10 Jul 2015 17:05:08 +0200
Subject: Update .mailmap [skip ci]

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

(limited to '.mailmap')

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.
-- 
cgit v1.2.1