summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 7 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index d23a2c8a8..c7a18cfb3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -34,3 +34,10 @@ Arne Henrik Juul <arnej@imf.unit.no> Arne H. Juul <arnej@solan.unit.no>
# Had email as name.
Dan Jacobson <jidanni@jidanni.org> jidanni@jidanni.org <jidanni@jidanni.org>
+
+# Consolidate names of same email address.
+Jeff Liu <jeff.liu@oracle.com> jeff.liu <jeff.liu@oracle.com>
+Jeff Liu <jeff.liu@oracle.com> Jie Liu <jeff.liu@oracle.com>
+
+# Convert to latin1 for a better 'THANKS' sort order.
+Aleksej Shilin <rootlexx@mail.ru> Алексей Шилин <rootlexx@mail.ru>