Merge branch 'maint-demo'

[eurobot/public.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index e3d08bff1ce88c8957581d4f4bc544341a84bf4d..b3f23a69439e65dd074b25af3bd732f3a1c1b980 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Jirka Kubias <jirka@DRAK-NB.(none)>
 Jirka Kubias <jirka@78ed6b52-5822-0410-8084-884f26da6e90>
 Jirka Kubias <kubiaj1@felk.cvut.cz>
 Jirka Kubias <kubiaj1@78ed6b52-5822-0410-8084-884f26da6e90>
+Jirka Kubias <jiri.kubias@addat.cz>
 Marek Peca <marek@tesla.(none)>
 Martin Zidek <martin@martin-nb2.(none)>
 Martin Zidek <martin@78ed6b52-5822-0410-8084-884f26da6e90>
@@ -19,3 +20,4 @@ Petr Benes <root@electrabenes.(none)>
 Tran Duy Khanh <root@ti-nb-linux.(none)>
 Tran Duy Khanh <root@ti.nirvana.tran.cz>
 Tran Duy Khanh <trandk1@78ed6b52-5822-0410-8084-884f26da6e90>
+Petr Kubiznak <root@petr.(none)>