From 795dbe712d937fb93bbf26d8a509f38a82ff1d33 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 17 Apr 2018 13:42:45 +0200 Subject: [PATCH] .mailmap update of April (2018) Change-Id: I6fe4ed198361c406d70e73c389ffcb2a593fa677 Reviewed-on: https://code.wireshark.org/review/27027 Reviewed-by: Anders Broman --- .mailmap | 3 +++ AUTHORS | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index ccdca8dece..66d3ff3d4f 100644 --- a/.mailmap +++ b/.mailmap @@ -3,6 +3,8 @@ Ahmad Fatoum Ahmad Fatoum Alan Partis alpartis Alexander Gärtner alage Alexander Wetzel deagol +Alexandr Savca Alexandr Savca +Alexandr Savca chinarulezzz Anders Broman Anders Broman Anders Broman Anders @@ -72,6 +74,7 @@ Irene Rüngeler Irene Rüngeler Irene Rüngeler Irene Rüngeler ruengeler +Jaime Caamaño Ruiz Jaime Caamaño Ruiz Jakub Zawadzki Jeff Morriss Jeff Morriss diff --git a/AUTHORS b/AUTHORS index 6c99c0dd71..c9d8bc8833 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3985,7 +3985,7 @@ Alexander Gärtner Alexander Nogikh Alexander Stein Alexander Wetzel -Alexandr Savca +Alexandr Savca Alistair Leslie-Hughes Allan Møller Madsen Ambarish Malpani @@ -4188,7 +4188,6 @@ Ivan Nardi Ivan Secerin J. Bruce Fields JC Wren -Jaime Caamaño Ruiz Jaime Caamaño Ruiz Jakub Pawlowski James Coleman @@ -4522,7 +4521,6 @@ Zhao Lin anonsvn cff339 cheloftus -chinarulezzz kardam kkoizumi shqking