X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.mailmap;h=ea8ef0eebf9a1141a1b0154209b98f81cab197f3;hb=96bb8b31c81dc2394317f2f083c3acf8087efea1;hp=14797092475a296a37cf7ef92f35e2f2425e6cee;hpb=24260e5baec0b1b9f9b6abf4cf4033686034df3f;p=rust.git

diff --git a/.mailmap b/.mailmap
index 14797092475..ea8ef0eebf9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,7 +5,6 @@
 # email addresses.
 #
 
-Aaron Power <theaaronepower@gmail.com> Erin Power <xampprocky@gmail.com>
 Aaron Todd <github@opprobrio.us>
 Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com>
 Adolfo Ochagavía <aochagavia92@gmail.com>
@@ -84,6 +83,8 @@ Eric Holk <eric.holk@gmail.com> <eholk@mozilla.com>
 Eric Holmes <eric@ejholmes.net>
 Eric Reed <ecreed@cs.washington.edu> <ereed@mozilla.com>
 Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org>
+Erin Power <xampprocky@gmail.com> <theaaronepower@gmail.com>
+Erin Power <xampprocky@gmail.com> <Aaronepower@users.noreply.github.com>
 Esteban Küber <esteban@kuber.com.ar> <esteban@commure.com>
 Esteban Küber <esteban@kuber.com.ar> <estebank@users.noreply.github.com>
 Esteban Küber <esteban@kuber.com.ar> <github@kuber.com.ar>
@@ -114,6 +115,7 @@ James Deng <cnjamesdeng@gmail.com> <cnJamesDeng@gmail.com>
 James Miller <bladeon@gmail.com> <james@aatch.net>
 James Perry <james.austin.perry@gmail.com>
 Jason Fager <jfager@gmail.com>
+Jason Liquorish <jason@liquori.sh> <Bassetts@users.noreply.github.com>
 Jason Orendorff <jorendorff@mozilla.com> <jason.orendorff@gmail.com>
 Jason Orendorff <jorendorff@mozilla.com> <jason@mozmac-2.local>
 Jason Toffaletti <toffaletti@gmail.com> Jason Toffaletti <jason@topsy.com>