Rollup merge of rust-lang#39670 - JanZerebecki:fix-mailmap-gifnksm, r…

…=steveklabnik

Fix mailmap for @gifnksm

cc rust-lang-nursery/thanks#71

.mailmap

@@ -132,9 +132,8 @@ Lindsey Kuper <[email protected]> <[email protected]>
 Luke Metz <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
-Makoto Nakashima <[email protected]> <[email protected]>
-Makoto Nakashima <[email protected]> gifnksm <[email protected]>
-Makoto Nakashima <[email protected]> NAKASHIMA, Makoto <[email protected]>
+NAKASHIMA, Makoto <[email protected]> <[email protected]>
+NAKASHIMA, Makoto <[email protected]> <[email protected]>
 Marcell Pardavi <[email protected]>
 Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
 Mark Sinclair <[email protected]>
@@ -150,7 +149,6 @@ Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
 Mickaël Raybaud-Roig <[email protected]> m-r-r <[email protected]>
 Ms2ger <[email protected]> <[email protected]>
 Mukilan Thiagarajan <[email protected]>
-NAKASHIMA, Makoto <[email protected]>
 Nathan Wilson <[email protected]>
 Nathaniel Herman <[email protected]> Nathaniel Herman <[email protected]>
 Neil Pankey <[email protected]> <[email protected]>