From 547f9b8126fbb558de184a3424b0fc22a3d57f27 Mon Sep 17 00:00:00 2001
From: Gabriel Scherer <gabriel.scherer@gmail.com>
Date: Thu, 19 Nov 2020 14:03:44 +0100
Subject: [PATCH] minor .mailmap additions

---
 .mailmap | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index d83748ccb..83e9239b1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,10 +28,21 @@ cvs2svn <no_author@ocaml.org>
 Damien Doligez <damien.doligez@inria.fr> Some Name <some@name.com>
 Damien Doligez <damien.doligez@inria.fr> doligez <damien.doligez@inria.fr>
 Mohamed Iguernelala <mohamed.iguernelala@gmail.com>
-Jérémie Dimino <jdimino@janestreet.com>
+Jérémie Dimino <jeremie@dimino.org>
+Jérémie Dimino <jeremie@dimino.org> <jdimino@janestreet.com>
 Jeremy Yallop <yallop@gmail.com> yallop <yallop@gmail.com>
 Nicolás Ojeda Bär <n.oje.bar@gmail.com>
-
+Nicolás Ojeda Bär <n.oje.bar@gmail.com> <nicolas.ojeda.bar@lexifi.com>
+François Pottier <francois.pottier@inria.fr>
+Jérôme Vouillon <Jerome.Vouillon@pps.jussieu.fr>
+Frédéric Bour <frederic.bour@lakaban.net>
+Frédéric Bour <frederic.bour@lakaban.net> <def@fb.com>
+Armaël Guéneau <Armael@users.noreply.github.com>
+Armaël Guéneau <Armael@users.noreply.github.com> <armael.gueneau@ens-lyon.fr>
+Armaël Guéneau <Armael@users.noreply.github.com> <armael@isomorphis.me>
+Edwin Török <edwin@etorok.net>
+Edwin Török <edwin@etorok.net> <edvin.torok@citrix.com>
+Edwin Török <edwin@etorok.net> <edwintorok@users.noreply.github.com>
 
 ### Approved Approvers