summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2016-05-21 02:01:02 -0300
committerIsmael Luceno2016-05-21 02:01:02 -0300
commitd0333bc574249d29480b5d98e91bf855e3faa705 (patch)
treea2098693ead48b44fc4b5d8d9565b4064b602c78
parent7c2ec969df7c1efcddaf5f9cf8b522b4ebdedeb0 (diff)
.mailmap: New mapping and simplify previous entries
-rw-r--r--.mailmap6
1 files changed, 3 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index a587131392..505bacdf85 100644
--- a/.mailmap
+++ b/.mailmap
@@ -53,9 +53,9 @@ George Sherwood <gsherwood@sourcemage.org> George Sherwood <chat@sourcemage.org>
George Sherwood <gsherwood@sourcemage.org> George Sherwood <george@beernabeer.com>
George Sherwood <gsherwood@sourcemage.org> George Sherwood <pilot@sourcemage.org>
Ismael Luceno <ismael@sourcemage.org> Ismael E. Luceno <=>
-Ismael Luceno <ismael@sourcemage.org> Ismael E. Luceno <ismael.luceno@gmail.com>
-Ismael Luceno <ismael@sourcemage.org> Ismael E. Luceno <ismael@sourcemage.org>
-Ismael Luceno <ismael@sourcemage.org> Ismael Luceno <ismael.luceno@gmail.com>
+Ismael Luceno <ismael@sourcemage.org> <ismael.luceno@gmail.com>
+Ismael Luceno <ismael@sourcemage.org>
+<ismael@sourcemage.org> <ismael@iodev.co.uk>
Jaka Kranjc <lynxlynxlynx@sourcemage.org> Jaka Kranjc <lynx@mages.ath.cx>
Jeremy Blosser <jblosser-smgl@firinn.org> Jeremy Blosser <jblosser@fawkes.sourcemage.org>
Jeremy Sutherland <belxjander@sourcemage.org> Jeremy Kajikawa <Belxjander@gmail.com>