Rollup merge of #67664 - Manishearth:mailmapfixes, r=Mark-Simulacrum

oli-obk · web-flow · commit 65bbcf0e13d0 · 2019-12-28T00:36:18.000+01:00
Fix some mailmap entries r? @pietroalbini
diff --git a/.mailmap b/.mailmap
@@ -155,6 +155,7 @@ Lindsey Kuper <lindsey@composition.al> <lkuper@mozilla.com>
 Luke Metz <luke.metz@students.olin.edu>
 Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca>
 Luqman Aden <me@luqman.ca> <laden@mozilla.com>
+Manish Goregaokar <manishsmail@gmail.com>
 Marcell Pardavi <marcell.pardavi@gmail.com>
 Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew>
 Mark Rousskov <mark.simulacrum@gmail.com>
@@ -186,6 +187,7 @@ Neil Pankey <npankey@gmail.com> <neil@wire.im>
 Nick Platt <platt.nicholas@gmail.com>
 Nicole Mazzuca <npmazzuca@gmail.com>
 Nif Ward <nif.ward@gmail.com>
+Nika Layzell <michael@thelayzells.com>
 Oliver Middleton <olliemail27@gmail.com> <ollie27@users.noreply.github.com>
 Oliver Scherer <oliver.schneider@kit.edu> <git-spam-no-reply9815368754983@oli-obk.de>
 Oliver Scherer <oliver.schneider@kit.edu> <git-spam9815368754983@oli-obk.de>
@@ -205,7 +207,6 @@ Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com>
 Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com>
 Peter Elmers <peter.elmers@yahoo.com> <peter.elmers@rice.edu>
 Peter Liniker <peter.liniker+github@gmail.com>
-Peter Zotov <whitequark@whitequark.org>
 Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com>
 Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>
 Philipp Brüschweiler <blei42@gmail.com> <bruphili@student.ethz.ch>
@@ -256,6 +257,7 @@ Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost>
 Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
 Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com>
 Vitali Haravy <HumaneProgrammer@gmail.com> Vitali Haravy <humaneprogrammer@gmail.com>
+whitequark <whitequark@whitequark.org>
 William Ting <io@williamting.com> <william.h.ting@gmail.com>
 Xuefeng Wu <benewu@gmail.com> Xuefeng Wu <xfwu@thoughtworks.com>
 Xuefeng Wu <benewu@gmail.com> XuefengWu <benewu@gmail.com>

-Original file line number
+Diff line change
 Luke Metz <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
 +Manish Goregaokar <[email protected]>
 Marcell Pardavi <[email protected]>
 Margaret Meyerhofer <[email protected]> <mmeyerho@andrew>
 Mark Rousskov <[email protected]>
 Nick Platt <[email protected]>
 Nicole Mazzuca <[email protected]>
 Nif Ward <[email protected]>
 +Nika Layzell <[email protected]>
 Oliver Middleton <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Oliver Scherer <[email protected]> <[email protected]>
 Peer Aramillo Irizar <[email protected]> parir <[email protected]>
 Peter Elmers <[email protected]> <[email protected]>
 Peter Liniker <[email protected]>
 -Peter Zotov <[email protected]>
 Phil Dawes <[email protected]> Phil Dawes <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Philipp Brüschweiler <[email protected]> <[email protected]>
 Vadim Petrochenkov <[email protected]>
 Vadim Petrochenkov <[email protected]> petrochenkov <[email protected]>
 Vitali Haravy <[email protected]> Vitali Haravy <[email protected]>
 +whitequark <[email protected]>
 William Ting <[email protected]> <[email protected]>
 Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
 Xuefeng Wu <[email protected]> XuefengWu <[email protected]>