aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--AUTHORS3
2 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 5705dd3912..1b348072bf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@ Daniël van Eeden <wireshark@myname.nl> Daniel van Eeden
Daniël van Eeden <wireshark@myname.nl> <git@myname.nl>
Dave Tapuska <dtapuska@google.com> dave@tapuska.com>
David Ameiss <dameiss@29west.com> <netshark@ameissnet.com>
+David Zoller <zollerd@gmail.com> dz-msfc <zollerd@gmail.com>
Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
@@ -90,6 +91,7 @@ Richard Sharpe <realrichardsharpe@gmail.com> <sharpe@ns.aus.com>
Robert Cragie <robert.cragie@gmail.com> Robert Cragie <robert.cragie@arm.com>
Robert Grange <robionekenobi@bluewin.ch> robioneknobi
Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au>
+Rudra Rugge <rrugge@juniper.net> Rudra Rugge <rudrarugge@gmail.com>
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>
diff --git a/AUTHORS b/AUTHORS
index 4c3388f327..1448b04ee7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4012,6 +4012,7 @@ David Creswick <dcrewi[AT]gyrae.net>
David Morsberger <dave[AT]morsberger.com>
David Snowdon <daves[AT]metamako.com>
David Tapuska <dave[AT]tapuska.com>
+David Zoller <zollerd[AT]gmail.com>
Deep Datta <ddatta[AT]ixiacom.com>
Denis Janssen <janssend[AT]gmail.com>
Dhananjay Patki <dhpatki[AT]cisco.com>
@@ -4182,7 +4183,6 @@ Roland Knall <rknall[AT]gmail.com>
Roman Leonhartsberger <ro.leonhartsberger[AT]gmail.com>
Roman Volkov <volkoff_roman[AT]ukr.net>
Rudra Rugge <rrugge[AT]juniper.net>
-Rudra Rugge <rudrarugge[AT]gmail.com>
Russel Howe <russel[AT]appliedinvention.com>
Rustam Safargalin <rustam.safargalin[AT]sifox.ru>
Ryan Mullen <rmmullen[AT]gmail.com>
@@ -4255,7 +4255,6 @@ anilkumar911 <anilkumar911[AT]gmail.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
dsrsupport <eugene.exarevsky[AT]dsr-company.com>
-dz-msfc <zollerd[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>