Rollup merge of #61125 - XAMPPRocky:master, r=jonas-schievink

Updated my mailmap entry
rust-lang · May 24, 2019 · b267b94 · b267b94
2 parents cdfacbd + aba152d
commit b267b94
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.mailmap b/.mailmap
@@ -6,7 +6,7 @@
 #
 
 Aaron Todd <github@opprobrio.us>
-Aaron Power <theaaronepower@gmail.com>
+Aaron Power <theaaronepower@gmail.com> Erin Power <xampprocky@gmail.com>
 Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com>
 Adolfo Ochagavía <aochagavia92@gmail.com>
 Adrien Tétar <adri-from-59@hotmail.fr>