aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap9
-rw-r--r--AUTHORS11
2 files changed, 14 insertions, 6 deletions
diff --git a/.mailmap b/.mailmap
index af70e8571d..06790d764c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,12 @@
+Jonathan Fleming <jonathan@optigo.net> Jonathan Fleming <jonathanfleming135@gmail.com>
+Christophe Guerber <christophe.guerber@gmail.com Christophe GUERBER <christophe.guerber@gmail.com>
+Kirill Chernyshov <nideff.ru@gmail.com> kanidef <nideff.ru@gmail.com>
+Başak Kalfa <basakkalfa@gmail.com> <basakkalfa@gmail.com>
+Ross Jacobs <rossbjacobs@gmail.com> Ross <rossbjacobs@gmail.com>
+Ross Jacobs <rossbjacobs@gmail.com> Ross <whim42+github@gmail.com>
+Thomas d'Otreppe <tdotreppe@aircrack-ng.org> Mister X <tdotreppe@aircrack-ng.org>
+Dana Sy <dana.hayden.sy@gmail.com> Dana Sy <dhs@exegin.com>
+Alex Sirr <alexsirruw@gmail.com> alexsirr <alexsirruw@gmail.com>
Adrian Simionov <daniel.simionov@gmail.com> <daniel.simionov@gmail.com>
Ahmad Fatoum <ahmad@a3f.at> Ahmad Fatoum <ahmad.fatoum@siemens.com>
Alan Partis <alpartis@thundernet.com> alpartis <alpartis@thundernet.com>
diff --git a/AUTHORS b/AUTHORS
index 8185d085ae..51462d7820 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3980,6 +3980,7 @@ Ajay Panicker <apanicke[AT]google.com>
Alan Birtles <alan.birtles[AT]eu.sony.com>
Alan Partis <alpartis[AT]thundernet.com>
Alex Badea <abadea[AT]ixiacom.com>
+Alex Sirr <alexsirruw[AT]gmail.com>
Alex Tessmer <dev[AT]tessmer.me>
AlexL <loginov.alex.valer[AT]gmail.com>
Alexander Couzens <lynxis[AT]fe80.eu>
@@ -4026,12 +4027,12 @@ Asaf Kave <kaveasaf[AT]gmail.com>
Ashish Shukla <shukla.a[AT]gmail.com>
Atli Guðmundsson <atli[AT]tern.is>
Aurelien Aptel <aaptel[AT]suse.com>
-Ba?ak Kalfa <basakkalfa[AT]gmail.com>
Babak Farrokhi <babak[AT]farrokhi.net>
Bartolo Otrit <bartolootrit[AT]gmail.com>
Baruch Siach <baruch[AT]tkos.co.il>
Basil <addremover[AT]gmail.com>
Bastien Bailly <babassbailly[AT]free.fr>
+Başak Kalfa <basakkalfa[AT]gmail.com>
Ben Burwell <bburwell[AT]lutron.com>
Ben Fox-Moore <ben.foxmoore[AT]accelleran.com>
Ben Huddleston <ben.huddleston[AT]couchbase.com>
@@ -4091,7 +4092,6 @@ D. W. Poon <dwpoon[AT]mail.ubc.ca>
Daan De Meyer <daan.j.demeyer[AT]gmail.com>
Dan Robertson <danlrobertson89[AT]gmail.com>
Dana Sy <dana.hayden.sy[AT]gmail.com>
-Dana Sy <dhs[AT]exegin.com>
Daniel Hirschberger <daniel.hirschberger+wireshark[AT]rub.de>
Daniel Mack <daniel[AT]zonque.org>
Daniel McLean <maczor[AT]gmail.com>
@@ -4310,6 +4310,7 @@ Kevin Grigorenko <kevin.grigorenko[AT]us.ibm.com>
Kevin Hogan <kwabena[AT]google.com>
Khalifa NDIAYE <khalifa.ndiaye[AT]orange.com>
Kim Bäckström <kim.backstrom[AT]gmail.com>
+Kirill Chernyshov <nideff.ru[AT]gmail.com>
Lajos Olah <lajos.olah.jr[AT]gmail.com>
Lars Christensen <larsch[AT]belunktum.dk>
Lars Sundström <lars.x.sundstrom[AT]ericsson.com>
@@ -4397,7 +4398,6 @@ Mike Morrin <morrinmike[AT]gmail.com>
Milan Stute <mstute[AT]seemoo.tu-darmstadt.de>
Miltos Patsiouras <mipatsio[AT]gmail.com>
Mirko Parthey <mirko.parthey[AT]web.de>
-Mister X <tdotreppe[AT]aircrack-ng.org>
Moraney Jalil <moraney.jalil[AT]outlook.com>
Moshe Kaplan <me[AT]moshekaplan.com>
Nathan Cole <nath[AT]thecoleresidence.co.uk>
@@ -4500,7 +4500,7 @@ Romain Tartière <romain[AT]blogreen.org>
Roman Leonhartsberger <ro.leonhartsberger[AT]gmail.com>
Roman Volkov <volkoff_roman[AT]ukr.net>
Ronen Boazi <ronen.boazi[AT]intel.com>
-Ross <whim42+github[AT]gmail.com>
+Ross Jacobs <rossbjacobs[AT]gmail.com>
Rudra Rugge <rrugge[AT]juniper.net>
Rui ZHANG <rzhang[AT]grandstream.cn>
Russel Howe <russel[AT]appliedinvention.com>
@@ -4567,6 +4567,7 @@ Thomas Chen <funorpain[AT]gmail.com>
Thomas Klausner <tk[AT]giga.or.at>
Thomas Portassau <thomas.portassau[AT]hotmail.fr>
Thomas Shen <thomashen[AT]gmail.com>
+Thomas d'Otreppe <tdotreppe[AT]aircrack-ng.org>
Tigran Mkrtchyan <tigran.mkrtchyan[AT]desy.de>
Tim (Thanh) Nguyen <tnnguyen[AT]broadcom.com>
Tim Cuthbertson <tim[AT]gfxmonk.net>
@@ -4625,12 +4626,10 @@ Yurii Lysyi <yurii.lysyi[AT]ericsson.com>
Yury Gargay <yury.gargay[AT]gmail.com>
Zdeněk Žamberský <zzdevel[AT]seznam.cz>
Zhao Lin <zlbinghamton[AT]gmail.com>
-alexsirr <alexsirruw[AT]gmail.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
cheloftus <cheloftus[AT]gmail.com>
dennis.lanov <dennis.lanov[AT]gmail.com>
-kanidef <nideff.ru[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
mkg20001 <mkg20001[AT]gmail.com>