aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Dénès2017-11-06 11:25:13 +0100
committerMaxime Dénès2017-11-06 11:25:13 +0100
commitca5e66889022f7ba7d3b6003aaccad3ec521e878 (patch)
tree34feb95956815d4edb4896c56d8f81355e17dfdf
parentdc6f4b07c38b416b1771bf7436af9303f25f0c1e (diff)
parent82db238369a6f5b3de1fa629c6852ffe8d447b3f (diff)
Merge PR #6085: Update .mailmap with a jkloos alias
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index b4271b9613..3d40a2df7e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -55,6 +55,7 @@ Tom Hutchinson <thutchin@gforge> thutchin <thutchin@85f007b7-5
Cezary Kaliszyk <cek@gforge> cek <cek@85f007b7-540e-0410-9357-904b9bb8a0f7>
Florent Kirchner <fkirchne@gforge> fkirchne <fkirchne@85f007b7-540e-0410-9357-904b9bb8a0f7>
Florent Kirchner <fkirchne@gforge> kirchner <kirchner@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Johannes Kloos <jkloos@mpi-sws.org> jkloos <jkloos@mpi-sws.org>
Matej Košík <matej.kosik@inria.fr> Matej Kosik <m4tej.kosik@gmail.com>
Matej Košík <matej.kosik@inria.fr> Matej Kosik <matej.kosik@inria.fr>
Marc Lasson <marc.lasson@gmail.com> mlasson <marc.lasson@gmail.com>