Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 61b9df5..3e2afe0 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -35,6 +35,7 @@ Augustin Degomme <adegomme@gmail.com> <adegomme@users.noreply.github.com>
 Augustin Degomme <adegomme@gmail.com> <augustin.degomme@imag.fr>
 Augustin Degomme <adegomme@gmail.com> <augustin.degomme@unibas.ch>
 Augustin Degomme <adegomme@gmail.com> <degomme@debian.localdomain>
+Augustin Degomme <adegomme@gmail.com> <degomme@idpann>
 Augustin Degomme <adegomme@gmail.com> <degomme@idpann.imag.fr>
 Augustin Degomme <adegomme@gmail.com> <degomme@localhost.localdomain>
 Augustin Degomme <adegomme@gmail.com> <degomme@wasabi>