aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 06790d764c..d38fbc644d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,4 @@
+Andreas Karlsson <se.nakarlsson@gmail.com> nakarlsson <se.nakarlsson@gmail.com>
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>
diff --git a/AUTHORS b/AUTHORS
index 0d0452cbb1..f207026c24 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3999,6 +3999,7 @@ Amine Kherbouche <amine.kherbouche[AT]6wind.com>
Amitoj Setia <asetia[AT]juniper.net>
Andre Puschmann <andre[AT]softwareradiosystems.com>
Andreas Gruenbacher <andreas.gruenbacher[AT]gmail.com>
+Andreas Karlsson <se.nakarlsson[AT]gmail.com>
Andreas Leibold <andreas.leibold[AT]harman.com>
Andreas Schultz <andreas.schultz[AT]travelping.com>
Andreas Stieger <andreas.stieger[AT]gmx.de>
@@ -4640,7 +4641,6 @@ dennis.lanov <dennis.lanov[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
mkg20001 <mkg20001[AT]gmail.com>
-nakarlsson <se.nakarlsson[AT]gmail.com>
pegah hajiani <pegah_haj[AT]yahoo.com>
shqking <shqking[AT]gmail.com>
zhongweisitu <zsitu[AT]extremenetworks.com>