aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 7 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 79b3f3f5b5..4b5c566120 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,4 @@
+Adrian Simionov <daniel.simionov@gmail.com> AdrianSimionov <daniel.simionov@gmail.com>
Alan Partis <alpartis@thundernet.com> alpartis <alpartis@thundernet.com>
Alexander Gärtner <sphinxs1988@googlemail.com> alage <sphinxs1988@googlemail.com>
Alexander Wetzel <alexander.wetzel@web.de> deagol
@@ -51,6 +52,7 @@ Jörg Mayer <jmayer@loplof.de> Joerg Mayer <jmayer@loplof.de>
Jörg Mayer <jmayer@loplof.de> Jörg Mayer <jmayer@egg.fg-networking.de>
Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.com>
Juan Jose Martin Carrascosa <juanjo@rti.com> Juanjo <juanjo@rti.com>
+Kary Rogers <kary.rogers@gmail.com> karyrogers <kary.rogers@gmail.com>
Krishna Chaitanya <chaitanya.mgit@gmail.com> tkc <chaitanya.mgit@gmail.com>
Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.co.at>
Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.com>
@@ -66,6 +68,8 @@ Michael Oed <michael.oed@gmail.com> Mike78 <michael.oed@gmail.com>
Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de>
Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local>
Michał Orynicz <michal.orynicz@tieto.com> michal.orynicz
+Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
+Michal Prívozník <mprivozn@redhat.com> <mprivozn@redhat.com>
Mikhail Koreshkov <drkor@hotbox.ru> unknown <drkor@hotbox.ru>
Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil
Moshe Kaplan <me@moshekaplan.com> moshekaplan <me@moshekaplan.com>
@@ -74,6 +78,7 @@ Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost>
Patrick Servello <patrick.servello@gmail.com> Patrick <patrick.servello@gmail.com>
Peter Ross <peter.ross@dsto.defence.gov.au> <peter.ross@rmit.edu.au>
Peter Wu <peter@lekensteyn.nl> <lekensteyn@gmail.com>
+Petr Gotthard <petr.gotthard@honeywell.com> Petr Gotthard <petr.gotthard@centrum.cz>
Pratik Yeole <pyeole@ncsu.edu> Pyeole <pyeole@ncsu.edu>
Qiaoyin Yang <qiaoyin.yang@gmail.com> <qiaoyin.yang[AT]gmail.com>
Remi Vichery <remi.vichery@gmail.com>
@@ -82,6 +87,7 @@ Richard Sharpe <realrichardsharpe@gmail.com> <sharpe@ns.aus.com>
Robert Grange <robionekenobi@bluewin.ch> robioneknobi
Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au>
Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com>
+Rustam Safargalin <rustam.safargalin@sifox.ru> Rustam S <rustam.safargalin@sifox.ru>
Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com>
Shekhar Chandra <ranushekhar@gmail.com> ranushekhar
Stephen Donnelly <stephen.donnelly@emulex.com> sfd
@@ -89,6 +95,7 @@ Stephen Fisher <stephenfisher@centurylink.net> <sfisher@panix.com>
Stephen Fisher <stephenfisher@centurylink.net> <sfisher@sdf.org>
Stephen Fisher <stephenfisher@centurylink.net> <stephenfisher-wireshark@outlook.com>
Stephen Fisher <stephenfisher@centurylink.net> <steve@stephen-fisher.com>
+Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
Warren Moxam <warrenmptgrey@gmail.com> warrenm <warrenmptgrey@gmail.com>
Warren Moxam <warrenmptgrey@gmail.com> <warren@peter-ubuntu32.(none)>
Wido Kelling <kellingwido@aol.com> Widok <kellingwido@aol.com>