From 2a613bbed907ec2378b40228dbd63a7da31ea8ea Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Wed, 16 Nov 2022 15:26:26 -0800
Subject: [PATCH] mailmap: Merge duplicates for contributors to the 6.0
 release.

---
 .mailmap | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.mailmap b/.mailmap
index bd890e81f0..cf64716686 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,6 +24,7 @@ Anders Kaseorg <anders@zulip.com> <anders@zulipchat.com>
 Anders Kaseorg <anders@zulip.com> <andersk@mit.edu>
 Aryan Shridhar <aryanshridhar7@gmail.com> <53977614+aryanshridhar@users.noreply.github.com>
 Aryan Shridhar <aryanshridhar7@gmail.com>
+aparna-bhatt <aparnabhatt2001@gmail.com> <86338542+aparna-bhatt@users.noreply.github.com>
 Ashwat Kumar Singh <ashwat.kumarsingh.met20@itbhu.ac.in>
 Austin Riba <austin@zulip.com> <austin@m51.io>
 BIKI DAS <bikid475@gmail.com>
@@ -33,6 +34,8 @@ Brock Whittaker <brock@zulipchat.com> <brock@zulipchat.org>
 Chris Bobbe <cbobbe@zulip.com> <cbobbe@zulipchat.com>
 Chris Bobbe <cbobbe@zulip.com> <csbobbe@gmail.com>
 Eeshan Garg <eeshan@zulip.com> <jerryguitarist@gmail.com>
+Eric Smith <erwsmith@gmail.com> <99841919+erwsmith@users.noreply.github.com>
+Ganesh Pawar <pawarg256@gmail.com> <58626718+ganpa3@users.noreply.github.com>
 Greg Price <greg@zulip.com> <gnprice@gmail.com>
 Greg Price <greg@zulip.com> <greg@zulipchat.com>
 Greg Price <greg@zulip.com> <price@mit.edu>
@@ -47,8 +50,11 @@ Kevin Mehall <km@kevinmehall.net> <kevin@humbughq.com>
 Kevin Mehall <km@kevinmehall.net> <kevin@zulip.com>
 Kevin Scott <kevin.scott.98@gmail.com>
 Lauryn Menard <lauryn@zulip.com> <lauryn.menard@gmail.com>
+Lauryn Menard <lauryn@zulip.com> <63245456+laurynmm@users.noreply.github.com>
 Mateusz Mandera <mateusz.mandera@zulip.com> <mateusz.mandera@protonmail.com>
+Matt Keller <matt@zulip.com>
 m-e-l-u-h-a-n <purushottam.tiwari.cd.cse19@itbhu.ac.in>
+Noble Mittal <noblemittal@outlook.com> <62551163+beingnoble03@users.noreply.github.com>
 Palash Raghuwanshi <singhpalash0@gmail.com>
 Parth <mittalparth22@gmail.com>
 Priyam Seth <sethpriyam1@gmail.com> <b19188@students.iitmandi.ac.in>
@@ -58,10 +64,14 @@ Rishi Gupta <rishig@zulipchat.com> <rishig+git@mit.edu>
 Rishi Gupta <rishig@zulipchat.com> <rishig@kandralabs.com>
 Rishi Gupta <rishig@zulipchat.com> <rishig@users.noreply.github.com>
 Rishabh Maheshwari <b20063@students.iitmandi.ac.in>
+Rixant Rokaha <rixantrokaha@gmail.com>
+Rixant Rokaha <rixantrokaha@gmail.com> <rishantrokaha@gmail.com>
+Rixant Rokaha <rixantrokaha@gmail.com> <rrokaha@caldwell.edu>
 Sayam Samal <samal.sayam@gmail.com>
 Scott Feeney <scott@oceanbase.org> <scott@humbughq.com>
 Scott Feeney <scott@oceanbase.org> <scott@zulip.com>
 Shlok Patel <shlokcpatel2001@gmail.com>
+Somesh Ranjan <somesh.ranjan.met20@itbhu.ac.in> <77766761+somesh202@users.noreply.github.com>
 Steve Howell <showell@zulip.com> <showell30@yahoo.com>
 Steve Howell <showell@zulip.com> <showell@yahoo.com>
 Steve Howell <showell@zulip.com> <showell@zulipchat.com>
@@ -79,5 +89,11 @@ Sahil Batra <sahil@zulip.com> <sahilbatra839@gmail.com>
 Yash RE <33805964+YashRE42@users.noreply.github.com> <YashRE42@github.com>
 Yash RE <33805964+YashRE42@users.noreply.github.com>
 Yogesh Sirsat <yogeshsirsat56@gmail.com>
+Yogesh Sirsat <yogeshsirsat56@gmail.com> <41695888+yogesh-sirsat@users.noreply.github.com>
 Zeeshan Equbal <equbalzeeshan@gmail.com> <54993043+zee-bit@users.noreply.github.com>
 Zeeshan Equbal <equbalzeeshan@gmail.com>
+Zev Benjamin <zev@zulip.com> <zev@dropbox.com>
+Zev Benjamin <zev@zulip.com> <zev@humbughq.com>
+Zev Benjamin <zev@zulip.com> <zev@mit.edu>
+Zixuan James Li <p359101898@gmail.com> <39874143+PIG208@users.noreply.github.com>
+Zixuan James Li <p359101898@gmail.com> <359101898@qq.com>