Update mailmap

Author: effigies

.mailmap

@@ -1,10 +1,10 @@
 Abel A. González Orozco <[email protected]>
 Aimi Watanabe <[email protected]>
 Aimi Watanabe <[email protected]> stymy <[email protected]>
-Alejandro Tabas <[email protected]>
-Alejandro Tabas <[email protected]> <[email protected]>
 Alejandro de la Vega <[email protected]>
 Alejandro de la Vega <[email protected]> <[email protected]>
+Alejandro Tabas <[email protected]>
+Alejandro Tabas <[email protected]> <[email protected]>
 Alexander Schaefer <[email protected]>
 Alexander Schaefer <[email protected]> <aschaefer@aschaefer-U36SD.(none)>
 Alexander Schaefer <[email protected]> <[email protected]>
@@ -65,9 +65,12 @@ Dylan M. Nielson <[email protected]>
 Dylan M. Nielson <[email protected]> <[email protected]>
 Eduard Ort <[email protected]>
 Elizabeth DuPre <[email protected]>
+Emmanuelle Gourieux <[email protected]>
+Eric Condamine <[email protected]>
+Eric Condamine <[email protected]> <[email protected]>
 Erik Ziegler <[email protected]>
-Erik Ziegler <[email protected]> <[email protected]>
 Erik Ziegler <[email protected]> <erik@erik-ubuntu.(none)>
+Erik Ziegler <[email protected]> <[email protected]>
 Fabio Bernardoni <[email protected]>
 Fabio Bernardoni <[email protected]> <[email protected]>
 Feilong Ma <[email protected]>
@@ -76,7 +79,8 @@ Franz Liem <[email protected]>
 Franz Liem <[email protected]> <franz.liem>
 Fred Loney <[email protected]>
 Gael Varoquaux <[email protected]>
-Gal Ben-Zvi <[email protected]>
+Gal Kepler <[email protected]>
+Gal Kepler <[email protected]> <[email protected]>
 Gavin Cooper <[email protected]> <[email protected]>
 Ghislain Vaillant <[email protected]>
 Ghislain Vaillant <[email protected]> <[email protected]>
@@ -96,11 +100,11 @@ Janosch Linkersdörfer <[email protected]>
 Jason Wong <[email protected]>
 Jason Wong <[email protected]> <[email protected]>
 Jens Kleesiek <[email protected]>
-Jessica Forbes <[email protected]>
 Jérémy Guillon <[email protected]> <[email protected]>
-Joerg Stadler <[email protected]> <[email protected]>
+Jessica Forbes <[email protected]>
 Joerg Stadler <[email protected]> <[email protected]>
 Joerg Stadler <[email protected]> <[email protected]>
+Joerg Stadler <[email protected]> <[email protected]>
 John A. Lee <[email protected]>
 John A. Lee <[email protected]> <[email protected]>
 Joke Durnez <[email protected]>
@@ -110,9 +114,9 @@ Junhao WEN <[email protected]>
 Kai Schlamp <[email protected]>
 Katherine Bottenhorn <[email protected]>
 Kesshi Jordan <[email protected]>
-Kesshi Jordan <[email protected]> <[email protected]>
 Kesshi Jordan <[email protected]> <[email protected]>
 Kesshi Jordan <[email protected]> <[email protected]>
+Kesshi Jordan <[email protected]> <[email protected]>
 Kesshi Jordan <[email protected]> <[email protected]>
 Kesshi Jordan <[email protected]> <[email protected]>
 Kevin Sitek <[email protected]>
@@ -122,10 +126,10 @@ Kornelius Podranski <[email protected]>
 Kristofer Montazeri <[email protected]>
 Krzysztof J. Gorgolewski <[email protected]>
 Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
-Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500.(none)>
-Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500>
 Krzysztof J. Gorgolewski <[email protected]> <filo@filo-dtc-laptop>
 Krzysztof J. Gorgolewski <[email protected]> <filo@filolaptop>
+Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500>
+Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500.(none)>
 Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
 Kshitij Chawla <[email protected]>
 Leonie Lampe <[email protected]>
@@ -143,6 +147,8 @@ Matteo Mancini <[email protected]>
 Matteo Visconti di Oleggio Castello <[email protected]>
 Matteo Visconti di Oleggio Castello <[email protected]> <[email protected]>
 Matthew Cieslak <[email protected]>
+Maurilio Genovese <[email protected]>
+Maurilio Genovese <[email protected]> <[email protected]>
 Michael Clark <[email protected]> <[email protected]>
 Michael Dayan <[email protected]>
 Michael Dayan <[email protected]> <[email protected]>
@@ -163,8 +169,8 @@ Oliver Contier <[email protected]> <[email protected]>
 Olivia Stanley <[email protected]>
 Oscar Esteban <[email protected]>
 Oscar Esteban <[email protected]> <code@oscaresteban>
-Pablo Polosecki <[email protected]> <[email protected]>
 Pablo Polosecki <[email protected]> <[email protected]>
+Pablo Polosecki <[email protected]> <[email protected]>
 Paul Kuntke <[email protected]>
 Paul Kuntke <[email protected]> <[email protected]>
 Paul Sharp <[email protected]>
@@ -185,8 +191,8 @@ Serge Koudoro <[email protected]>
 Sharad Sikka <[email protected]>
 Shariq Iqbal <[email protected]>
 Shariq Iqbal <[email protected]> <[email protected]>
-Shoshana Berleant <[email protected]> <[email protected]>
 Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
+Shoshana Berleant <[email protected]> <[email protected]>
 Shoshana Berleant <[email protected]> Ubuntu <[email protected]>
 Simon Rothmei <[email protected]>
 Simon Rothmei <[email protected]> <[email protected]>
@@ -210,5 +216,7 @@ Victor Saase <[email protected]>
 Weijie Huang <[email protected]>
 William Triplett <[email protected]> <[email protected]>
 Wolfgang Pauli <[email protected]>
+Wu Jianxiao <[email protected]>
+Wu Jianxiao <[email protected]> <[email protected]>
 Xiangzhen Kong <[email protected]>
 Yaroslav Halchenko <[email protected]> <[email protected]>