X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=blobdiff_plain;f=.mailmap;h=2134fc5bf16780a1ed811768282c58f4b1cb50b1;hb=06d611a3997a63fc54f7141ed9fa3105c9d0a8e4;hp=f0562198e6c980e885ebb80d1f526098db51a04a;hpb=bf9c2b0cb30cbe994f3a1859cf46224dd52039e1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.mailmap b/.mailmap
index f0562198e6..2134fc5bf1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -196,6 +196,7 @@ Jackmcbarn <jackmcbarn@gmail.com>
 Jackmcbarn <jackmcbarn@gmail.com> <jackmcbarn@users.noreply.github.com>
 jagori <jagori79@gmail.com>
 James Forrester <jforrester@wikimedia.org>
+Jaime Crespo <jcrespo@wikimedia.org>
 Jan Gerber <j@thing.net> <j@users.mediawiki.org>
 Jan Luca Naumann <jan@jans-seite.de>
 Jan Luca Naumann <jan@jans-seite.de> <jan@users.mediawiki.org>
@@ -409,9 +410,11 @@ Steven Walling <swalling@wikimedia.org>
 Subramanya Sastry <ssastry@wikimedia.org>
 Sucheta Ghoshal <sghoshal@wikimedia.org>
 Sumit Asthana <asthana.sumit23@gmail.com>
+TerraCodes <terracodes@tools.wmflabs.org>
 Thalia Chan <thalia@cantorion.org>
-Thiemo Mättig (WMDE) <thiemo.maettig@wikimedia.de>
-Thiemo Mättig (WMDE) <thiemo.maettig@wikimedia.de> <mr.heat@gmx.de>
+Thalia Chan <thalia@cantorion.org> <thalia.e.chan@googlemail.com>
+Thiemo Mättig <thiemo.maettig@wikimedia.de>
+Thiemo Mättig <thiemo.maettig@wikimedia.de> <mr.heat@gmx.de>
 This, that and the other <at.light@live.com.au>
 tholam <t.lam@lamsinfosystem.com>
 Thomas Bleher <ThomasBleher@gmx.de> <tbleher@users.mediawiki.org>
@@ -452,9 +455,9 @@ X! <soxred93@gmail.com> <soxred93@users.mediawiki.org>
 Yaron Koren <yaron57@gmail.com>
 Yaron Koren <yaron57@gmail.com> <yaron@users.mediawiki.org>
 Yaroslav Melnychuk <yaroslavmelnuchuk@gmail.com>
-Yongmin Hong <revi@member.fsf.org>
-Yongmin Hong <revi@member.fsf.org> <revi@pobox.com>
-Yongmin Hong <revi@member.fsf.org> <reviwiki@gmail.com>
+Yongmin Hong <revi@pobox.com>
+Yongmin Hong <revi@pobox.com> <revi@member.fsf.org>
+Yongmin Hong <revi@pobox.com> <reviwiki@gmail.com>
 Yuri Astrakhan <yurik@wikimedia.org>
 Yuri Astrakhan <yurik@wikimedia.org> <yuriastrakhan@gmail.com>
 Yuri Astrakhan <yurik@wikimedia.org> <yurik@users.mediawiki.org>