Merge branch 'v2.x'

Author: QuLogic

.mailmap

@@ -1,76 +1,180 @@
+Adam Ortiz <[email protected]>
+
 Adrien F. Vincent <[email protected]>
+Adrien F. Vincent <[email protected]> <[email protected]>
+
 Andrew Dawson <[email protected]> <[email protected]>
+
 anykraus <[email protected]> <[email protected]>
+
 Ariel Hernán Curiale <[email protected]>
+
 Ben Cohen <[email protected]> <[email protected]>
+
 Ben Root <[email protected]> Benjamin Root <[email protected]>
+
+Benjamin Congdon <[email protected]>
+Benjamin Congdon <[email protected]> bcongdon <[email protected]>
+
 Casper van der Wel <[email protected]>
+
 Christoph Gohlke <[email protected]> cgohlke <[email protected]>
 Christoph Gohlke <[email protected]> C. Gohlke <[email protected]>
+
 Cimarron Mittelsteadt <[email protected]> Cimarron <[email protected]>
+
+Conner R. Phillips <[email protected]> <conner.r.phillips.com>
+
+Dan Hickstein <[email protected]>
+
+Daniel Hyams <[email protected]>
 Daniel Hyams <[email protected]> Daniel Hyams <dhyams@gitdev.(none)>
+
 David Kua <[email protected]> <[email protected]>
+
+Devashish Deshpande <[email protected]>
+
 endolith <[email protected]>
+
 Eric Dill <[email protected]> <[email protected]>
+
 Erik Bray <[email protected]> <[email protected]>
+
 Eric Ma <[email protected]> <[email protected]>
 Eric Ma <[email protected]> <[email protected]>
+
+Filipe Fernandes <[email protected]>
+
+Florian Le Bourdais <[email protected]>
+
 Francesco Montesano <[email protected]> montefra <[email protected]>
+
+hannah <[email protected]>
+
+Hans Moritz Günther <[email protected]>
+
+J. Goutin <[email protected]> JGoutin <[email protected]>
+
+Jack Kelly <[email protected]> <[email protected]>
+Jack Kelly <[email protected]> <[email protected]>
+
 Jaime Fernandez <[email protected]>
+
 Jake Vanderplas <[email protected]>
 Jake Vanderplas <[email protected]> <[email protected]>
 Jake Vanderplas <[email protected]> <[email protected]>
+
 James R. Evans <[email protected]>
+
 Jeff Lutgen <[email protected]> <[email protected]>
+
 Jeffrey Bingham <[email protected]>
+
 Jens Hedegaard Nielsen <[email protected]>
 Jens Hedegaard Nielsen <[email protected]> <[email protected]>
+
 John Hunter <[email protected]>
+
 Jorrit Wronski <[email protected]>
-Jouni K. Seppänen <[email protected]>
+
 Joseph Fox-Rabinovitz <[email protected]> Mad Physicist <[email protected]>
 Joseph Fox-Rabinovitz <[email protected]> Joseph Fox-Rabinovitz <[email protected]>
+
+Jouni K. Seppänen <[email protected]>
+
 Julien Schueller <[email protected]> <[email protected]>
 Julien Schueller <[email protected]> <[email protected]>
+
 Kevin Davies <[email protected]> <[email protected]>
+
 kikocorreoso <[email protected]> <[email protected]>
+
+Klara Gerlei <[email protected]>
+Klara Gerlei <[email protected]> klaragerlei <[email protected]>
+
+Kristen M. Thyng <[email protected]>
+
 Leeonadoh <[email protected]>
+
 Lennart Fricke <[email protected]> <[email protected]>
+
 Levi Kilcher <[email protected]>
+
+Lion Krischer <[email protected]> <[email protected]>
+
 Martin Fitzpatrick <[email protected]> <[email protected]>
+
 Matthew Emmett <[email protected]>
 Matthew Emmett <[email protected]> <[email protected]>
+
 Matthias Bussonnier <[email protected]>
+
+Matthias Lüthi <[email protected]>
+Matthias Lüthi <[email protected]> <[email protected]>
+
 Michael Droettboom <[email protected]> <[email protected]>
 Michael Droettboom <[email protected]> Michael Droettboom <mdboom@debian-vm>
+
 Michiel de Hoon <[email protected]>
 Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
 Michiel de Hoon <[email protected]> Michiel de Hoon <[email protected]>
+
 MinRK <[email protected]>
 MinRK <[email protected]> Min RK <[email protected]>
+
 Nelle Varoquaux <[email protected]>
+
 Nic Eggert <[email protected]> Nic Eggert <[email protected]>
 Nic Eggert <[email protected]> Nic Eggert <[email protected]>
+
 Nicolas P. Rougier <[email protected]>
+
 OceanWolf <[email protected]>
+
 Patrick Chen <[email protected]>
+
+Paul Hobson <[email protected]>
+Paul Hobson <[email protected]> vagrant <vagrant@precise32.(none)>
+
 Paul Ivanov <[email protected]> <[email protected]>
+
 Per Parker <[email protected]>
+
 Peter Würtz <[email protected]>
 Peter Würtz <[email protected]> <[email protected]>
+
 Phil Elson <[email protected]>
 Phil Elson <[email protected]> <[email protected]>
 Phil Elson <[email protected]> <[email protected]>
+
+productivememberofsociety666 <[email protected]> none <[email protected]>
+
+RyanPan <[email protected]>
+
 Scott Lasley <[email protected]>
+
+Sebastian Raschka <[email protected]>
+Sebastian Raschka <[email protected]> <[email protected]>
+
 Simon Cross <[email protected]> <[email protected]>
+
+Slav Basharov <[email protected]>
+
 sohero <[email protected]> sohero <[email protected]>
+
 Stefan van der Walt <[email protected]> <[email protected]>
+
 switham <[email protected]> switham <[email protected]>
+
 Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 Thomas A Caswell <[email protected]> Thomas A Caswell <“[email protected]”>
+
+Trish Gillett-Kawamoto <[email protected]> <[email protected]>
+
 Werner F Bruhin <[email protected]>
+
 Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20057.(none)>
 Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20061.(none)>