X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8a6be46801437262a0e5c88626615af6b4e2da7..2ba8549e0a8371efc09c66bad197097f88d93366:/.mailmap

diff --git a/.mailmap b/.mailmap
index ef3e135314..9103b9c9ae 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,6 @@
 # .mailmap file, used by git shortlog
 #
+Ehsan Azimi <eazimi@ehsan.irisa.fr> <azimi.ehsan@outlook.com>
 Khaled Baati <kbaati@realopt-Latitude-E6530>
 Benoît Bimal <bimal@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Laurent Bobelin <lbobelin@mintcar.lip.ens-lyon.fr> <lbobelin@mintcar.imag.fr>
@@ -51,6 +52,7 @@ Bruno Donassolo <donassbr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Yann Duplouy <yann.duplouy@inria.fr> <duplouy@crans.org>
 Pierre-François Dutot <dutot@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
 Julien Emmanuel <julien.emmanuel@inria.fr>
+Julien Emmanuel <julien.emmanuel@inria.fr> <webcretaire@julien-emmanuel.com>
 Julien Emmanuel <julien.emmanuel@inria.fr> <julien.emmanuel@atos.net>
 Lionel Eyraud-Dubois <lionel.eyraud-dubois@inria.fr>
 Lionel Eyraud-Dubois <lionel.eyraud-dubois@inria.fr> <eyraud@etincel.(none)>