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

Centril · web-flow · commit 1972162f9291 · 2019-05-24T19:31:50.000+02:00
Updated my mailmap entry
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>

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`
`8`	`8`	`Aaron Todd <[email protected]>`
`9`		`-Aaron Power <[email protected]>`
	`9`	`+Aaron Power <[email protected]> Erin Power <[email protected]>`
`10`	`10`	`Abhishek Chanda <[email protected]> Abhishek Chanda <[email protected]>`
`11`	`11`	`Adolfo Ochagavía <[email protected]>`
`12`	`12`	`Adrien Tétar <[email protected]>`