Fixed, more compact, ordered mailmap (+fixes)

twitwi · twitwi · commit daa8b3645328 · 2017-02-07T23:15:20.000+01:00
diff --git a/.mailmap b/.mailmap
@@ -1,155 +1,53 @@
-Hakim Achterberg <hachterberg@bigr-hakim>
-James Adams <jladams@ou.edu>
-Joshua Adelman <joshua.adelman@gmail.com>
-James Allen <jamesallen0108@gmail.com>
-Sung Bae <sung.bae@canterbury.ac.nz>
-Piotr Banaszkiewicz <piotr@banaszkiewicz.org>
-Pauline Barmby <pbarmby@uwo.ca>
-Ewan Barr <ewan.d.barr@googlemail.com>
-David Beitey <david@davidjb.com>
-Trevor Bekolay <tbekolay@gmail.com>
-Jared Berghold <jared@intersect.org.au>
-John Blischak <jdblischak@gmail.com>
-Maxime Boissonneault <maxime.boissonneault@calculquebec.ca>
-Azalee Bostroem <abostroem@gmail.com>
-Andy Boughton <abought@gmail.com>
-Andy Boughton <pchemist@gmail.com>
-Amy Brown <amyrhoda@gmail.com>
-Kyler Brown <kylerjbrown@gmail.com>
 Abigail Cabunoc Mayes <abigail.cabunoc@gmail.com>
-Abigail Cabunoc Mayes <abigail.cabunoc@oicr.on.ca>
-John Chase <chasejohnh@gmail.com>
-Jin Choi <jinchoi721@gmail.com>
-Richard Clare <richard.clare@canterbury.ac.nz>
-Sarah Clayton <sarah.c.clayton@gmail.com>
-Peter Cock <p.j.a.cock@googlemail.com>
-Marianne Corvellec <marianne.corvellec@ens-lyon.org>
-Thomas Coudrat <thomas.coudrat@gmail.com>
-Ryan Dale <dalerr@niddk.nih.gov>
-Matt Davis <jiffyclub@gmail.com>
-Andrew Davison <andrew.davison@unic.cnrs-gif.fr>
-Raffaella Demichelis <raffaella.demichelis@curtin.edu.au>
-Gabriel A. Devenyi <gdevenyi@gmail.com>
-Emily Dolson <emilyldolson@gmail.com>
-David Dotson <dotsdl@gmail.com>
-Laurent Duchesne <l@urent.org>
-Jonah Duckles <jonah@duckles.org>
-Rémi Emonet <remi@heeere.com>
-Rémi Emonet <remi.emonet@univ-st-etienne.fr>
-K. Arthur Endsley <endsley@umich.edu>
-Nicolas Fauchereau <Nicolas.Fauchereau@gmail.com>
-Talitha Ford <talithaford@Talithas-MacBook-Pro.local>
-Ivan Gonzalez <iglpdc@gmail.com>
-Jan Gosmann <jan@hyper-world.de>
-John Gosset <john.gosset@gmail.com>
-Jeremy Gray <jeremycgray@gmail.com>
-Bastian Greshake <bgreshake@googlemail.com>
-Mary Haley <haley@ucar.edu>
-Sam Hames <samuel.hames@uqconnect.edu.au>
-Jessica B. Hamrick <jhamrick@berkeley.edu>
-Michael Hansen <hansen.mike@gmail.com>
-Konrad Hinsen <konrad.hinsen@fastmail.net>
-Johan Hjelm <johh@dtu.dk>
-Toby Hodges <tbyhdgs@gmail.com>
-Derek Howard <derekhoward@gmail.com>
-Damien Irving <damien_irving@yahoo.com.au>
-Damien Irving <irving.damien@gmail.com>
-Mike Jackson <michaelj@epcc.ed.ac.uk>
-Ben Jolly <jollyb@landcareresearch.co.nz>
-Nick Jones <n.jones@auckland.ac.nz>
-Blake Joyce <bjoyce3@email.arizona.edu>
-David Ketcheson <dketch@gmail.com>
-W. Trevor King <wking@tremily.us>
-Sigrid Klerke <sigridklerke@gmail.com>
-Benjamin Laken <benlaken@gmail.com>
-Hilmar Lapp <hlapp@drycafe.net>
-Doug Latornell <djl@douglatornell.ca>
-Jean-Christophe Leyder <jc.leyder@sciops.esa.int>
-Johnny Lin <johnny@johnny-lin.com>
-Andrew Lonsdale <andrew.lonsdale@lonsbio.com.au>
-Alexandre Manhaes Savio <alexsavio@gmail.com>
-Dan Mazur <danpmazur@gmail.com>
-François Michonneau <francois.michonneau@gmail.com>
-Bill Mills <mills.wj@gmail.com>
-Zakariyya Mughal <zaki.mughal@gmail.com>
-Narayanan Raghupathy <narayanan.r@gmail.com>
-Lex Nederbragt <lex.nederbragt@bio.uio.no>
-Ryan Neufeld <raeneufe@uwaterloo.ca>
-Aaron O'Leary <aaron.oleary@gmail.com>
-Adam Obeng <github@binaryeagle.com>
-Jeramia Ory <jeramia.ory@gmail.com>
-Natalia Osiecka <nzw.natalia.osiecka@gmail.com>
-Jon Pipitone <jon.pipitone@utoronto.ca>
-Adrianna Pińska <adrianna.pinska@gmail.com>
-Timothée Poisot <tim@poisotlab.io>
-Pawel Pomorski <ppomorsk@sharcnet.ca>
-Florian Rathgeber <florian.rathgeber@gmail.com>
-Adam Richie-Halford <richford@uw.edu>
-Janet Riley <jriley@janetriley.net>
+Abigail Cabunoc Mayes <abigail.cabunoc@gmail.com> <abigail.cabunoc@oicr.on.ca>
+Andy Boughton <abought@gmail.com> <pchemist@gmail.com>
+Andy Kwong <andyhckwong@gmail.com>
+Ardita Shkurti <ardita.shkurti@gmail.com>
 Ariel Rokem <arokem@gmail.com>
-Marjorie Roswell <mroswell@gmail.com>
-Mahdi Sadjadi <mahdisadjadi@asu.edu>
-Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Sebastian Schmeier <s.schmeier@gmail.com>
-Leigh Sheneman <leighs@msu.edu>
 Arron Shiffer <ams379@nau.edu>
-Ardita Shkurti <ardita.shkurti@gmail.com>
-Raniere Silva <ra092767@ime.unicamp.br>
-Raniere Silva <raniere@ime.unicamp.br>
-Raniere Silva <raniere@rgaiacs.com>
-Nicola Soranzo <nicola.soranzo@tgac.ac.uk>
-Nicola Soranzo <nsoranzo@tiscali.it>
-Erik Spence <ejspence@scinet.utoronto.ca>
-Ashwin Srinath <ashwinsrnth@gmail.com>
-Valentina Staneva <val_is_everywhere@yahoo.com>
-Valentina Staneva <vms16@uw.edu>
-Jim Stapleton <jmstpltn@gmail.com>
-Brian Stucky <stuckyb@flmnh.ufl.edu>
-Cody Taylor <codyalantaylor@gmail.com>
 Bartosz Telenczuk <bartosz@telenczuk.pl>
-Ian Thomas <ianedwardthomas@gmail.com>
-Brian Thorne <hardbyte@gmail.com>
-Giovanni Torres <giovanni.torres@gmail.com>
-Tim Tröndle <tim.troendle@younicos.com>
-Olav Vahtras <vahtras@kth.se>
-Edwin van der Helm <vdhelm@strw.leidenuniv.nl>
-Alistair Walsh <alistair.walsh@me.com>
-Derek Weitzel <djw8605@gmail.com>
-Daniel Wheeler <daniel.wheeler2@gmail.com>
-Ethan White <ethan@weecology.org>
-Frank Willmore <frankwillmore@gmail.com>
-Greg Wilson <gvwilson@software-carpentry.org>
-Greg Wilson <gvwilson@third-bit.com>
-Andrea Zonca <code@andreazonca.com>
-Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-Aidan Wilson <aidan.b.wilson@gmail.com>
-Andy Kwong <andyhckwong@gmail.com>
-Corinne Bosley <corinne.bosley@metoffice.gov.uk>
-Eilis Hannon <ejh243@knight.ex.ac.uk>
+Brian Stucky <stuckyb@flmnh.ufl.edu>
+Damien Irving <damien_irving@yahoo.com.au> <irving.damien@gmail.com>
+Derek Howard <derekhoward@gmail.com>
+Edwin van der Helm <vdhelm@strw.leidenuniv.nl> <vdhelm@users.noreply.github.com>
 Evan P. Williamson <evanpeterw@gmail.com>
-Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-Ian Carroll <icarroll@sesync.org
-Ian Carroll <itcarroll@users.noreply.github.com>
-Jorge Aranda <jorge.aranda@cuevano.ca>
-J.R. Leeman <kd5wxb@gmail.com>
+Ewan Barr <ewan.d.barr@googlemail.com>
+François Michonneau <francois.michonneau@gmail.com>
+François Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.Com>
+Giovanni Torres <giovanni.torres@gmail.com>
+Greg Wilson <gvwilson@software-carpentry.org> <gvwilson@third-bit.com>
+Ian Carroll <icarroll@sesync.org> <itcarroll@users.noreply.github.com>
+James Adams <jladams@ou.edu>
+James Allen <james@sharelatex.com> <jamesallen0108@gmail.com>
+Jean-Christophe Leyder <jc.leyder@sciops.esa.int> <leyder@users.noreply.github.com>
 Jessica Upani <nabbygirl@gmail.com>
+Jim Stapleton <jmstpltn@gmail.com>
+Jin Choi <jinchoi721@gmail.com>
+John Chase <chasejohnh@gmail.com>
 Kate Hertweck <k8hertweck@gmail.com>
-Konrad Förstner <konrad@foerstner.org>
-Lauren Ko <lauren.ko@unt.edu>
-Marius Bjørnstad <pmb@fa2k.net>
-Meredith Rawls <mrawls@uw.edu>
-Michael Connell <mikeroe@msn.com>
-Nathan Walter <walter9@illinois.edu>
-Neal Davis <davisneale@gmail.com>
+Leigh Sheneman <leighs@msu.edu>
+Maxime Boissonneault <maxime.boissonneault@calculquebec.ca>
+Mike Jackson <m.jackson@software.ac.uk> <michaelj@epcc.ed.ac.uk>
+Narayanan Raghupathy <narayanan.r@gmail.com>
+Neal Davis <davis68@illinois.edu> <davisneale@gmail.com>
+Nicola Soranzo <nicola.soranzo@tgac.ac.uk> <nsoranzo@tiscali.it>
+Pauline Barmby <pbarmby@uwo.ca>
 Pawel Pomorski <ppomorsk@users.noreply.github.com>
-Ry4an Brase <ry4an-githubpublic@ry4an.org>
-Ryan May <rmay31@gmail.com>
+Peter Cock <p.j.a.cock@googlemail.com>
+Raffaella Demichelis <raffaella.demichelis@curtin.edu.au>
+Raniere Silva <raniere@rgaiacs.com> <ra092767@ime.unicamp.br>
+Raniere Silva <raniere@rgaiacs.com> <raniere@ime.unicamp.br>
+Rémi Emonet <remi@heeere.com> <remi.emonet@reverse--com.heeere>
+Rémi Emonet <remi@heeere.com> <twitwi@users.noreply.github.com>
+Richard Clare <richard.clare@canterbury.ac.nz>
+Ryan Dale <dalerr@niddk.nih.gov>
+Ryan Neufeld <raeneufe@uwaterloo.ca> <metavee@users.noreply.github.com>
+Sarah Clayton <sarah.c.clayton@gmail.com>
 Sigrid Klerke <SigridK@users.noreply.github.com>
-Stéphane Guillou <stephane.guillou@member.fsf.org>
-Stephen Childs <sechilds@mgmail.com>
-Thomas Robitaille <thomas.robitaille@gmail.com>
-Tracy Teal <tracyt@idyll.org>
+Timothée Poisot <t.poisot@gmail.com> <tim@poisotlab.io>
+Toby Hodges <tbyhdgs@gmail.com>
+Trevor Bekolay <tbekolay@gmail.com>
 Valentina Staneva <valentina-s@users.noreply.github.com>
-Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Valentina Staneva <val_is_everywhere@yahoo.com>
 Willem Ligtenberg <willem@wligtenberg.nl>
-Xiao Xiao <xiao@weecology.org>
+YourName <you@example.com>

-Original file line number
+Diff line change
@@ @@ -1,155 +1,53 @@ @@
 -Hakim Achterberg <hachterberg@bigr-hakim>
 -James Adams <[email protected]>
 -Joshua Adelman <[email protected]>
 -James Allen <[email protected]>
 -Sung Bae <[email protected]>
 -Piotr Banaszkiewicz <[email protected]>
 -Pauline Barmby <[email protected]>
 -Ewan Barr <[email protected]>
 -David Beitey <[email protected]>
 -Trevor Bekolay <[email protected]>
 -Jared Berghold <[email protected]>
 -John Blischak <[email protected]>
 -Maxime Boissonneault <[email protected]>
 -Azalee Bostroem <[email protected]>
 -Andy Boughton <[email protected]>
 -Andy Boughton <[email protected]>
 -Amy Brown <[email protected]>
 -Kyler Brown <[email protected]>
 Abigail Cabunoc Mayes <[email protected]>
 -Abigail Cabunoc Mayes <[email protected]>
 -John Chase <[email protected]>
 -Jin Choi <[email protected]>
 -Richard Clare <[email protected]>
 -Sarah Clayton <[email protected]>
 -Peter Cock <[email protected]>
 -Marianne Corvellec <[email protected]>
 -Thomas Coudrat <[email protected]>
 -Ryan Dale <[email protected]>
 -Matt Davis <[email protected]>
 -Andrew Davison <[email protected]>
 -Raffaella Demichelis <[email protected]>
 -Gabriel A. Devenyi <[email protected]>
 -Emily Dolson <[email protected]>
 -David Dotson <[email protected]>
 -Laurent Duchesne <[email protected]>
 -Jonah Duckles <[email protected]>
 -Rémi Emonet <[email protected]>
 -Rémi Emonet <[email protected]>
 -K. Arthur Endsley <[email protected]>
 -Nicolas Fauchereau <[email protected]>
 -Talitha Ford <[email protected]>
 -Ivan Gonzalez <[email protected]>
 -Jan Gosmann <[email protected]>
 -John Gosset <[email protected]>
 -Jeremy Gray <[email protected]>
 -Bastian Greshake <[email protected]>
 -Mary Haley <[email protected]>
 -Sam Hames <[email protected]>
 -Jessica B. Hamrick <[email protected]>
 -Michael Hansen <[email protected]>
 -Konrad Hinsen <[email protected]>
 -Johan Hjelm <[email protected]>
 -Toby Hodges <[email protected]>
 -Derek Howard <[email protected]>
 -Damien Irving <[email protected]>
 -Damien Irving <[email protected]>
 -Mike Jackson <[email protected]>
 -Ben Jolly <[email protected]>
 -Nick Jones <[email protected]>
 -Blake Joyce <[email protected]>
 -David Ketcheson <[email protected]>
 -W. Trevor King <[email protected]>
 -Sigrid Klerke <[email protected]>
 -Benjamin Laken <[email protected]>
 -Hilmar Lapp <[email protected]>
 -Doug Latornell <[email protected]>
 -Jean-Christophe Leyder <[email protected]>
 -Johnny Lin <[email protected]>
 -Andrew Lonsdale <[email protected]>
 -Alexandre Manhaes Savio <[email protected]>
 -Dan Mazur <[email protected]>
 -François Michonneau <[email protected]>
 -Bill Mills <[email protected]>
 -Zakariyya Mughal <[email protected]>
 -Narayanan Raghupathy <[email protected]>
 -Lex Nederbragt <[email protected]>
 -Ryan Neufeld <[email protected]>
 -Aaron O'Leary <[email protected]>
 -Adam Obeng <[email protected]>
 -Jeramia Ory <[email protected]>
 -Natalia Osiecka <[email protected]>
 -Jon Pipitone <[email protected]>
 -Adrianna Pińska <[email protected]>
 -Timothée Poisot <[email protected]>
 -Pawel Pomorski <[email protected]>
 -Florian Rathgeber <[email protected]>
 -Adam Richie-Halford <[email protected]>
 -Janet Riley <[email protected]>
 +Abigail Cabunoc Mayes <[email protected]> <[email protected]>
 +Andy Boughton <[email protected]> <[email protected]>
 +Andy Kwong <[email protected]>
 +Ardita Shkurti <[email protected]>
 Ariel Rokem <[email protected]>
 -Marjorie Roswell <[email protected]>
 -Mahdi Sadjadi <[email protected]>
 -Elliott Sales de Andrade <[email protected]>
 -Sebastian Schmeier <[email protected]>
 -Leigh Sheneman <[email protected]>
 Arron Shiffer <[email protected]>
 -Ardita Shkurti <[email protected]>
 -Raniere Silva <[email protected]>
 -Raniere Silva <[email protected]>
 -Raniere Silva <[email protected]>
 -Nicola Soranzo <[email protected]>
 -Nicola Soranzo <[email protected]>
 -Erik Spence <[email protected]>
 -Ashwin Srinath <[email protected]>
 -Valentina Staneva <[email protected]>
 -Valentina Staneva <[email protected]>
 -Jim Stapleton <[email protected]>
 -Brian Stucky <[email protected]>
 -Cody Taylor <[email protected]>
 Bartosz Telenczuk <[email protected]>
 -Ian Thomas <[email protected]>
 -Brian Thorne <[email protected]>
 -Giovanni Torres <[email protected]>
 -Tim Tröndle <[email protected]>
 -Olav Vahtras <[email protected]>
 -Edwin van der Helm <[email protected]>
 -Alistair Walsh <[email protected]>
 -Derek Weitzel <[email protected]>
 -Daniel Wheeler <[email protected]>
 -Ethan White <[email protected]>
 -Frank Willmore <[email protected]>
 -Greg Wilson <[email protected]>
 -Greg Wilson <[email protected]>
 -Andrea Zonca <[email protected]>
 -Zbigniew Jędrzejewski-Szmek <[email protected]>
 -Aidan Wilson <[email protected]>
 -Andy Kwong <[email protected]>
 -Corinne Bosley <[email protected]>
 -Eilis Hannon <[email protected]>
 +Brian Stucky <[email protected]>
 +Damien Irving <[email protected]> <[email protected]>
 +Derek Howard <[email protected]>
 +Edwin van der Helm <[email protected]> <[email protected]>
 Evan P. Williamson <[email protected]>
 -Zbigniew Jędrzejewski-Szmek <[email protected]>
 -Ian Carroll <[email protected]
 -Ian Carroll <[email protected]>
 -Jorge Aranda <[email protected]>
 -J.R. Leeman <[email protected]>
 +Ewan Barr <[email protected]>
 +François Michonneau <[email protected]>
 +François Michonneau <[email protected]> <[email protected]>
 +Giovanni Torres <[email protected]>
 +Greg Wilson <[email protected]> <[email protected]>
 +Ian Carroll <[email protected]> <[email protected]>
 +James Adams <[email protected]>
 +James Allen <[email protected]> <[email protected]>
 +Jean-Christophe Leyder <[email protected]> <[email protected]>
 Jessica Upani <[email protected]>
 +Jim Stapleton <[email protected]>
 +Jin Choi <[email protected]>
 +John Chase <[email protected]>
 Kate Hertweck <[email protected]>
 -Konrad Förstner <[email protected]>
 -Lauren Ko <[email protected]>
 -Marius Bjørnstad <[email protected]>
 -Meredith Rawls <[email protected]>
 -Michael Connell <mikeroe@msn.com>
 -Nathan Walter <[email protected]>
 -Neal Davis <[email protected]>
 +Leigh Sheneman <[email protected]>
 +Maxime Boissonneault <[email protected]>
 +Mike Jackson <[email protected]> <[email protected]>
 +Narayanan Raghupathy <[email protected]>
 +Neal Davis <[email protected]> <davisneale@gmail.com>
 +Nicola Soranzo <[email protected]> <[email protected]>
 +Pauline Barmby <[email protected]>
 Pawel Pomorski <[email protected]>
 -Ry4an Brase <[email protected]>
 -Ryan May <[email protected]>
 +Peter Cock <[email protected]>
 +Raffaella Demichelis <[email protected]>
 +Raniere Silva <[email protected]> <[email protected]>
 +Raniere Silva <[email protected]> <[email protected]>
 +Rémi Emonet <[email protected]> <[email protected]>
 +Rémi Emonet <[email protected]> <[email protected]>
 +Richard Clare <[email protected]>
 +Ryan Dale <[email protected]>
 +Ryan Neufeld <[email protected]> <[email protected]>
 +Sarah Clayton <[email protected]>
 Sigrid Klerke <[email protected]>
 -Stéphane Guillou <[email protected]>
 -Stephen Childs <[email protected]>
 -Thomas Robitaille <[email protected]>
 -Tracy Teal <[email protected]>
 +Timothée Poisot <[email protected]> <[email protected]>
 +Toby Hodges <[email protected]>
 +Trevor Bekolay <[email protected]>
 Valentina Staneva <[email protected]>
 -Zbigniew Jędrzejewski-Szmek <[email protected]>
 +Valentina Staneva <[email protected]>
 Willem Ligtenberg <[email protected]>
 -Xiao Xiao <[email protected]>
 +YourName <[email protected]>