Replace tabs in files with editor modeline "expandtab"

[metze/wireshark/wip.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 5abd049aa79e6bfab30e1da082a35d56b1bd0ae2..54b1e0803abd079ccbcf0a9130e5802507582d82 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -12,7 +12,9 @@ Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
 Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com>
 Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com>
 Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
+Hadriel Kaplan <hadrielk@yahoo.com> <hadriel@128technology.com>
 Hannes R. Boehm <hannes@boehm.org> hannes <hannes@localhost>
+Hitesh K. Maisheri <maisheri.hitesh@gmail.com> <hmaisher@cisco.com>
 Irene Rüngeler <ruengeler@wireshark.org> Irene Ruengeler <ruengeler@wireshark.org>
 Irene Rüngeler <ruengeler@wireshark.org> ruengeler <ruengeler@wireshark.org>
 Irene Rüngeler <ruengeler@wireshark.org> <I.Ruengeler@fh-muenster.de>