From 51fd1db1cf8ee39d74be436d4bab83955a3c8a18 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 4 Sep 2020 18:25:45 +0200
Subject: [PATCH] Bug 26394: Update .mailmap

The .mailmap file used to generate the stats is different from the one we have in our repo. It's much more complete and should be integrated into Koha.

Test plan:
Confirm that the different mappings are correct

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .mailmap | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 307 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 9a3a2dabc9..d70cb18467 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,8 +1,284 @@
+ahbanks <ahbanks>  ahbanks <ahbanks>
+hpassini <hpassini>  hpassini <hpassini>
+amillar <amillar>  amillar <amillar>
+btoumi <btoumi>  btoumi <btoumi>
+cauchoip <cauchoip>  cauchoip <cauchoip>
+doxulting <doxulting>  doxulting <doxulting>
+fisheye <fisheye>  fisheye <fisheye>
+fmmarzoa <fmmarzoa>  fmmarzoa <fmmarzoa>
+gmccullagh <gmccullagh>  gmccullagh <gmccullagh>
+hellen <hellen>  hellen <hellen>
+plugz <plugz>  plugz <plugz>
+Ambrose Li <ambrose.li@gmail.com>  acli <acli>
+Mike <dragon28@ihug.co.nz>  dragon28 <dragon28>
+Pierreck Le Gall <pierreck@ineo.com>  plg <plg>
+Gynn Lomax <gynn@katipo.co.nz>  truth_nz <truth_nz>
+Pat Eyler <pate@eyler.org>  pate <pate>
+Andrew Arensburger <arensb@gmail.com>  arensb <arensb>
+alaurin <alaurin@biblibre.com>  alaurin <alaurin>
+Albert Oller <ago@bywatersolutions.com>  Albert Oller <ago@bywatersolutions.com>
+Albert Oller <ago@bywatersolutions.com>  Albert Oller <root@ThinkPad-W520.localdomain>
+Allen Reinmeyer <allen.reinmeyer@liblime.com>  Allen Reinmeyer <acr@arwen.metavore.com>
+Allen Reinmeyer <allen.reinmeyer@liblime.com>  Allen Reinmeyer <allen.reinmeyer@liblime.com>
+Amit Gupta <amit.gupta@osslabs.biz>  amit gupta <amit.gupta@osslabs.biz>
+Amit Gupta <amit.gupta@osslabs.biz>  Amit Gupta <amit.gupta@osslabs.biz>
+Andrei V. Toutoukine <tut@isuct.ru>  Andrei V. Toutoukine <tut@isuct.ru>
+Andrew Elwell <andrew.elwell@gmail.com>  Andrew Elwell <andrew.elwell@gmail.com>
+Andrew Elwell <andrew.elwell@gmail.com>  Andrew Elwell <Andrew.Elwell@gmail.com>
+Andrew Moore <andrew.moore@liblime.com>  Andrew Moore <andrew.moore@liblime.com>
+Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>  Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
+Biblibre <dev_patches@biblibre.com>  biblibre <dev_patches@biblibre.com>
+BibLibre <dev_patches@biblibre.com>  BibLibre <dev_patches@biblibre.com>
+Bob Lyon <bob_lyon@katipo.co.nz>  bob_lyon <bob_lyon>
+Brendan A. Gallagher <brendan@bywatersolutions.com>  Brendan A. Gallagher <brendan@bywatersolutions.com>
+Brendan A. Gallagher <brendan@bywatersolutions.com>  Brendan A. Gallagher <info@bywatersolutions.com>
+Brendan A. Gallagher <brendan@bywatersolutions.com>  brendan <brendan@bywatersolutions.com>
+Brendan A. Gallagher <brendan@bywatersolutions.com>  brendan <info@bywatersolutions.com>
+Brendan A. Gallagher <brendan@bywatersolutions.com>  Brendan <info@bywatersolutions.com>
+Brendan A. Gallagher <brendan@bywatersolutions.com>  ByWater Solutions <brendan@bywatersolutions.com>
+Brendan A. Gallagher <brendan@bywatersolutions.com>  Brendan Gallagher <info@bywatersolutions.com>
+Brendan A. Gallagher <brendan@bywatersolutions.com>  Brendan Gallagher <brendan@bywatersolutions.com>
+Brian Harrington <brian@jhu.edu>  Brian Harrington <brian@jhu.edu>
+Brian Harrington <brians.listmail@gmail.com>  Brian Harrington <brians.listmail@gmail.com>
+Brice Sanchez <brice.sanchez@sys-tech.net>  Brice Sanchez <brice.sanchez@sys-tech.net>
+Bryce Sanchez <brice.sanchez@sys-tech.net>  Bryce Sanchez <brice.sanchez@sys-tech.net>
+Chris Catalfo <ccatalfo@gmail.com>  Chris Catalfo <ccatalfo@gmail.com>
+Chris Catalfo <chris.catalfo@liblime.com>  Chris Catalfo <chris.catalfo@liblime.com>
+Chris Cormack <chris@katipo.co.nz>  chris <chris>
+Chris Cormack <chris@bigballofwax.co.nz>  Chris Cormack <chris@bigballofwax.co.nz>
+Chris Cormack <chrisc@catalyst.net.nz>  Chris Cormack <chrisc@catalyst.net.nz>
+Chris Cormack <chrisc@catalyst.net.nz>  Chris Cormack <chrisc@git.koha-community.org>
+Chris Cormack <chrisc@library.org.nz>  Chris Cormack <chrisc@library.org.nz>
+Chris Cormack <chris@bigballofwax.co.nz>  Chris Cormack <chris.cormack@liblime.com>
+Chris Cormack <chris@bigballofwax.co.nz>  Chris Cormack <chris@figwit.metavore.com>
+Chris Cormack <chris@bigballofwax.co.nz>  Chris Cormack <chris@snaga.liblime.co.nz>
+Chris Cormack <chris@bigballofwax.co.nz>  Chris Cormack <crc@arwen.metavore.com>
+Chris Cormack <chris@bigballofwax.co.nz>  Chris Cormack <crc@liblime.com>
+Christopher Hall <chrish@catalyst.net.nz>  Chris Hall <chrish@catalyst.net.nz>
+Christopher Hall <chrish@catalyst.net.nz>  Christopher Hall <chris.hall@catalyst.net.nz>
+Christophe Croullebois <christophe.croullebois@biblibre.com>  christophe croullebois <christophe.croullebois@biblibre.com>
+Chris Nighswonger <cnighswonger@foundations.edu>  Chris <cnighswonger@foundations.edu>
+Chris Nighswonger <chris.nighswonger@gmail.com>  Chris Nighswonger <chris.nighswonger@gmail.com>
+Chris Nighswonger <chris.nighswonger@liblime.com>  Chris Nighswonger <chris.nighswonger@liblime.com>
+Chris Nighswonger <cnighswonger@foundations.edu>  Chris Nighswonger <cnighswonger@foundations.edu>
+Chris Nighswonger <crn@arwen.metavore.com>  Chris Nighswonger <crn@arwen.metavore.com>
+conan (aka Fernando L. Canizo) <conan@lugmen.org.ar>  conan (aka Fernando Canizo) <conan@lugmen.org.ar>
+conan (aka Fernando L. Canizo) <conan@lugmen.org.ar>  conan (aka Fernando L. Canizo) <conan@lugmen.org.ar>
+Danny Bouman <danny.bouman@hclibrary.org>  Danny Bouman <danny.bouman@hclibrary.org>
+Darrell Ulm <darrellulm@smfpl.org>  Darrell Ulm <darrellulm@kohavmware>
+Darrell Ulm <darrellulm@smfpl.org>  Darrell Ulm <darrellulm@smfpl.org>
+Duncan Tyler <duncan@catalyst.net.nz>  Duncan Tyler <duncan@catalyst.net.nz>
+Duncan Tyler <duncan@catalyst.net.nz>  Duncan Tyler <duncan@duncan-SoT.wgtn.cat-it.co.nz>
+Finlay Thompson <finlay@katipo.co.nz>  finlayt <finlayt>
+Frédéric Demians <f.demians@tamil.fr>  f.demians at tamil.fr <(frederic@tamil.fr)>
+Frédéric Demians <f.demians@tamil.fr>  Frédéric DEMIANS <f.demians@tamil.fr>
+Frédéric Demians <f.demians@tamil.fr>  Frédéric DEMIANS <frederic@tamil.fr>
+Frédéric Demians <f.demians@tamil.fr>  Frederic Demians <f.demians@tamil.fr>
+Frédéric Demians <f.demians@tamil.fr>  Frederic DEMIANS <f.demians@tamil.fr>
+Frédéric Demians <f.demians@tamil.fr>  Frédéric Demians <f.demians@tamil.fr>
+Frédéric Demians <f.demians@tamil.fr>  Frédéric DEMIANS <f.demians@tamil.fr>
+Frédérick Capovilla <frederick.capovilla@libeo.com>  Frédérick Capovilla <frederick.capovilla@libeo.com>
+Frédérick Capovilla <frederick.capovilla@sys-tech.net>  Frédérick Capovilla <frederick.capovilla@sys-tech.net>
+Frère Sébastien Marie <semarie@latrappe.fr>  Frère Sébastien Marie <semarie-koha@latrappe.fr>
+Frère Sébastien Marie <semarie@latrappe.fr>  Frère Sébastien Marie <semarie@latrappe.fr>
+Fridolyn SOMERS <fridolyn.somers@progilone.fr>  Fridolyn SOMERS <fridolyn.somers@progilone.fr>
+Waylon Robertson <genji@katipo.co.nz>  genjimoto <genjimoto>
+Greg Barniskis <gbarniskis@gmail.com>  Greg Barniskis <gbarniskis@gmail.com>
+hcpl test <koha-test@koha.hclibrary.org>  hcpl test <koha-test@koha.hclibrary.org>
+Henri-Damien LAURENT <henridamien.laurent@biblibre.com>  hdl <hdl>
+Henri-Damien LAURENT <henridamien.laurent@biblibre.com>  Henri-Damien LAURENT <henridamien@koha-fr.org>
+Henri-Damien LAURENT <henridamien.laurent@biblibre.com>  Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
+Ian Walls <ian.walls@bywatersolutions.com>  Ian Walls <ian.walls@bywatersolutions.com>
+Ian Walls <koha.sekjal@gmail.com>  Ian Walls <koha.sekjal@gmail.com>
+Ian Walls <koha.sekjal@gmail.com>  Ian Walls <sekjal@Samael.local>
+Mason James <mason@kohaaloha.com>  JAMES Mason <mason@kohaaloha.com>
+Janusz Kaczmarek <januszop@gmail.com>  Janusz Kaczmarek <januszop@gmail.com>
+Jared Camins-ESAKOV <camins@numismatics.org>  Jared CAMINS-ESAKOV <camins@numismatics.org>
+Jared Camins-Esakov <jcamins@bywatersolutions.com>  Jared Camins-Esakov <jcamins@bywatersolutions.com>
+Jared Camins-Esakov <jcamins@cpbibliography.com>  Jared Camins-Esakov <jcamins@cpbibliography.com>
+J. David Bavousett <David.Bavousett@liblime.com>  J. David Bavousett <David.Bavousett@liblime.com>
+J. David Bavousett <dbavousett@ptfs.com>  J. David Bavousett <dbavousett@ptfs.com>
+Jesse Weaver <jesse.weaver@liblime.com>  Jesse Weaver <jesse.weaver@liblime.com>
+Jesse Weaver <pianohacker@gmail.com>  Jesse Weaver <pianohacker@gmail.com>
+Joshua Ferraro <jmf@liblime.com>  jmf@arwen.metavore.com <jmf@arwen.metavore.com>
+Joe Atzberger <joe.atzberger@liblime.com>  Joe Atzberger <joe.atzberger@liblime.com>
+Joe Atzberger <ohiocore@gmail.com>  Joe Atzberger <ohiocore@gmail.com>
+Joe Atzberger (siptest <atz4sip@arwen.metavore.com>  Joe Atzberger (siptest <atz4sip@arwen.metavore.com>
+John Beppu <john.beppu@gmail.com>  John Beppu <john.beppu@gmail.com>
+John Beppu <john.beppu@liblime.com>  John Beppu <john.beppu@liblime.com>
+John Seymour <John.Seymour@nal.gov.au>  John Seymour <John.Seymour@nal.gov.au>
+John Soros <john.soros@biblibre.com>  John Soros <john.soros@biblibre.com>
+Jon Aker <jaker@mvwsd.org>  Jon Aker <jaker@mvwsd.org>
+Jonathan Druart <jonathan.druart@biblibre.com>  Jonathan Druart <jonathan.druart@biblibre.com>
+Jono Mingard <reason.koan@gmail.com>  Jono Mingard <reason.koan@gmail.com>
+Jorgia Kelsey <jorgia_m_kelsey@hotmail.com>  Jorgia Kelsey <jorgia_m_kelsey@hotmail.com>
+Joshua Ferraro <jmf@liblime.com>  joshferraro <joshferraro>
+Joshua Ferraro <jmf@liblime.com>  Joshua Ferraro <jmf@liblime.com>
+Joy Nelson <joy@bywatersolutions.com>  Joy Nelson <joy@bywatersolutions.com>
+Juan Romay Sieira <juan.sieira@xercode.es>  Juan Romay Sieira <juan.sieira@xercode.es>
+Julian Maurice <julian.maurice@biblibre.com>  Julian Maurice <julian.maurice@biblibre.com>
+Joshua Ferraro <jmf@arwen.metavore.com>  kados <jmf@arwen.metavore.com>
+Joshua Ferraro <jmf@liblime.com>  kados <jmf@liblime.com>
+Joshua Ferraro <jmf@myacpl.org>  kados <kados>
+Katrin Fischer <katrin.fischer.83@web.de>  Katrin Fischer <katrin.fischer.83@web.de>
+Katrin Fischer <Katrin.Fischer.83@web.de>  Katrin Fischer <Katrin.Fischer.83@web.de>
+Katrin Fischer <katrin.fischer@bsz-bw.de>  Katrin Fischer <katrin.fischer@bsz-bw.de>
+Katrin Fischer <Katrin.Fischer.bsz-bw.de>  Katrin Fischer <Katrin.Fischer.bsz-bw.de>
+Katrin Fischer <Katrin.Fischer@bsz-bw.de>  Katrin Fischer <Katrin.Fischer@bsz-bw.de>
+koha <koha@false.(none)>  koha <koha@false.(none)>
+Koha <koha@koha-dev.de>  Koha <koha@koha-dev.de>
+koha <koha@localhost.(none)>  koha <koha@localhost.(none)>
+koha <koha@smfpl.org>  koha <koha@smfpl.org>
+koha-preprod <koha-preprod@sys-tech.net>  koha-preprod <koha-preprod@sys-tech.net>
+Koha Production <koha-pro@koha-01.hclibrary.org>  Koha Production <koha-pro@koha-01.hclibrary.org>
+Koha User <koha@dev.(none)>  Koha User <koha@dev.(none)>
+Koustubha Kale <kmkale@anantcorp.com>  Koustubha Kale <kmkale@anantcorp.com>
+Kyle M Hall <kyle.m.hall@gmail.com>  Kyle Hall <kyle.m.hall@gmail.com>
+Kyle M Hall <kyle@bywatersolutions.com>  Kyle M Hall <kyle@bywatersolutions.com>
+Kyle M Hall <kyle.m.hall@gmail.com>  Kyle M Hall <kyle.m.hall@gmail.com>
+Larry Baerveldt <larry@bywatersolutions.com>  Larry Baerveldt <larry@bywatersolutions.com>
+Lars Wirzenius <lars@catalyst.net.nz>  Lars Wirzenius <lars@catalyst.net.nz>
+lavide <lavide>  lavide <lavide>
+Liz Rea <liz@nekls.org>  Liz Rea <liz@nekls.org>
+Liz Rea <lrea@nekls.org>  Liz Rea <lrea@nekls.org>
+Liz Rea <wizzyrea@gmail.com>  Liz Rea <wizzyrea@gmail.com>
+Liz Rea <liz@catalyst.net.nz>   Liz <wizzyrea@gmail.com>
+Lyon3 Team <koha@univ-lyon3.fr>  Lyon3 Team <koha@univ-lyon3.fr>
+Magnus Enger <magnus@enger.priv.no>  Magnus Enger <magnus@enger.priv.no>
+Marc Balmer <marc@msys.ch>  Marc Balmer <marc@msys.ch>
+Marc Chantreux <marc.chantreux@biblibre.com>  Marc Chantreux <marc.chantreux@biblibre.com>
+Marcel de Rooy <m.de.rooy@rijksmuseum.nl>  Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
+Marcel de Rooy <M.de.Rooy@rijksmuseum.nl>  Marcel de Rooy <M.de.Rooy@rijksmuseum.nl>
+Marcel de Rooy <marcel@libdevelop.rijksmuseum.nl>  marcel@libdevelop.rijksmuseum.nl <marcel@libdevelop.rijksmuseum.nl>
+Mark Gavillet <mark.gavillet@ptfs-europe.com>  Mark Gavillet <mark.gavillet@ptfs-europe.com>
+Martin Renvoize <martin@dev1.vm.bytemark.co.uk>  Martin Renvoize <martin@dev1.vm.bytemark.co.uk>
+Martin Renvoize <martin.renvoize@ptfs-europe.com>  Martin Renvoize <martin.renvoize@ptfs-europe.com>
+Mason James <mason.james@liblime.com>  mason.james@liblime.com <mason.james@liblime.com>
+Mason James <mason.james@liblime.com>  Mason James <mason.james@liblime.com>
+Mason James <mason@kohaaloha.com>  Mason James <mason@kohaaloha.com>
+Mason James <mason.loves.sushi@gmail.com>  Mason James <mason.loves.sushi@gmail.com>
+Mason James <mason@snaga.liblime.com>  Mason James <mason@snaga.liblime.com>
+Mason James <mason@snaga.liblime.co.nz>  Mason James <mason@snaga.liblime.co.nz>
+Mason James <mtj@arwen.metavore.com>  Mason James <mtj@arwen.metavore.com>
+Mason James <mtj@ezeke.liblime.com>  Mason James <mtj@ezeke.liblime.com>
+Mason James <mtj@kohaaloha.com>  Mason James <mtj@kohaaloha.com>
+Mason James <mtj@liblime.com>  Mason James <mtj@liblime.com>
+Mason James <root@ezeke.liblime.com>  Mason James <root@ezeke.liblime.com>
+Matthew Hunt <matt@catalyst.net.nz>  Matthew Hunt <matt@catalyst.net.nz>
+Matthias Meusburger <matthias.meusburger@biblibre.com>  Matthias Meusburger <matthias.meusburger@biblibre.com>
+Maxime Pelletier <maxime.pelletier@libeo.com>  Maxime Pelletier <maxime.pelletier@libeo.com>
+Meenakshi.R <meenakshi.r@osslabs.biz>  Meenakshi.R <meenakshi.r@osslabs.biz>
+Michael Hafen <mdhafen@tech.washk12.org>  Michael Hafen <mdhafen@tech.washk12.org>
+Michael Hafen <mdhafen@washk12.org>  Michael Hafen <mdhafen@washk12.org>
+MJ Ray <mjr@phonecoop.coop>  MJ Ray <mjr@phonecoop.coop>
+Nahuel Angelinetti <nahuel.angelinetti@biblibre.com>  Nahuel Angelinetti <nahuel.angelinetti@biblibre.com>
+Nahuel Angelinetti <nahuel.angelinetti@biblibre.com>  Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
+Nate Curulla <nate@bywatersolutions.com>  Nate Curulla <nate@bywatersolutions.com>
+Nicole C. Engard <nce@kohavm76.liblime.com>  NCE <nce@kohavm76.liblime.com>
+Nicolas Morin <nicolas.morin@biblibre.com>  Nicolas Morin <nicolas.morin@biblibre.com>
+Nicole C. Engard <nengard@bywatersolutions.com>  Nicole C. Engard <nengard@bywatersolutions.com>
+Nicole C. Engard <nce@arwen.metavore.com>  Nicole Engard <nce@arwen.metavore.com>
+Nicole C. Engard <nce@liblime.com>  Nicole Engard <nce@liblime.com>
+Nicole C. Engard <nengard@bywatersolutions.com>  Nicole Engard <nengard@bywatersolutions.com>
+Nicole C. Engard <nengard@gmail.com>  Nicole Engard <nengard@gmail.com>
+Nicole C. Engard <nicole.engard@liblime.com>  Nicole Engard <nicole.engard@liblime.com>
+Nuño López Ansótegui <nunyo@masmedios.com>  Nuño López Ansótegui <nunyo@masmedios.com>
+NYUHSL <hsl@nyumc.org>  NYUHSL <hsl@nyumc.org>
+Owen Leonard <oleonard@myacpl.org>  oleonard <oleonard>
+Olwen Williams <olwen@katipo.co.nz>  olwen <olwen>
+Owen Leonard <oleonard@myacpl.org>  Owen Leonard <oleonard@myacpl.org>
+Owen Leonard <oleonard@myacpl.org>  Owen Leonard <oleonard@oleonard-desktop.(none)>
+Paul Poulain <paul.poulain@biblibre.com>  paul <paul@localhost.(none)>
+Paul Poulain <paul.poulain@biblibre.com>  paul <paul.poulain@biblibre.com>
+Paul Poulain <paul.poulain@biblibre.com>  Paul POULAIN <paul@koha-fr.org>
+Paul Poulain <paul.poulain@biblibre.com>  Paul Poulain <paul.poulain@biblibre.com>
+Paul Poulain <paul.poulain@biblibre.com>  Paul POULAIN <paul.poulain@biblibre.com>
+pawelzc <pawelzc>  pawelzc <pawelzc>
+Peter Lorimer <peter@oslo.ie>  Peter Lorimer <peter@oslo.ie>
+Philippe Jaillon <jaillon@chataigne.emse.fr>  Philippe Jaillon <jaillon@chataigne.emse.fr>
+Jesse Weaver <pianohacker@gmail.com>  Pianohacker <pianohacker@gmail.com>
+Piotr Wejman <ropuch@bagno.be>  Piotr Wejman <ropuch@bagno.be>
+Polytechnic University Koha Installation <poly-pro@builder.(none)>  Polytechnic University Koha Installation <poly-pro@builder.(none)>
+preprod34 <preprod34@koha.ccsr.qc.ca>  preprod34 <preprod34@koha.ccsr.qc.ca>
+PTFS Contractor <dbavousett@ptfs.com>  PTFS Contractor <dbavousett@ptfs.com>
+PTFS <koha-dev@ptfs.com>  PTFS <koha-dev@ptfs.com>
+QA Manager <patches@koha.org>  QA Manager <patches@koha.org>
+Rachel Hamilton-Williams <rachel@katipo.co.nz>  rachelkatipo <rachelkatipo>
+Chris Cormack <chris@katipo.co.nz>  rangi <rangi>
+Reed Wade <reed@catalyst.net.nz>  Reed Wade <reed@catalyst.net.nz>
+Ricardo Dias Marques <koha@ricmarques.net>  Ricardo Dias Marques <koha@ricmarques.net>
+ri_chard <ri_chard>  ri_chard <ri_chard>
+Rick Welykochy <rick@praxis.com.au>  Rick Welykochy <rick@praxis.com.au>
+Robin Sheat <robin@catalyst.net.nz>  Robin Sheat <robin@catalyst.net.nz>
+root <root@descartes.biblibre.com>  root <root@descartes.biblibre.com>
+root <root@fbcit.campus.foundations.edu>  root <root@fbcit.campus.foundations.edu>
+root <root@henridamienlaurent.dyndns.org>  root <root@henridamienlaurent.dyndns.org>
+root <root@lists.nekls.org>  root <root@lists.nekls.org>
+root <root@liz-koha.nekls.org>  root <root@liz-koha.nekls.org>
+root <root@mail.oplin.org>  root <root@mail.oplin.org>
+root <root@newkoha32.local>  root <root@newkoha32.local>
+root <root@snaga.liblime.co.nz>  root <root@snaga.liblime.co.nz>
+Russel Garlick <russel@ahinui.local>  Russel Garlick <russel@ahinui.local>
+Russel Garlick <russel.garlick@liblime.com>  Russel Garlick <russel.garlick@liblime.com>
+Russel Garlick <rwg@arwen.metavore.com>  Russel Garlick <rwg@arwen.metavore.com>
+Russel Garlick <rwg@liblime.com>  Russel Garlick <rwg@liblime.com>
+D Ruth Bavousett <ruth@bywatersolutions.com>  ruth@bywatersolutions.com <ruth@bywatersolutions.com>
+Ryan Higgins <rch@balrog.liblime.com>  Ryan Higgins <rch@balrog.liblime.com>
+Ryan HIggins <rch@false.(none)>  Ryan HIggins <rch@false.(none)>
+Ryan Higgins <rch@liblime.com>  Ryan Higgins <rch@liblime.com>
+Ryan Higgins <ryan.higgins@liblime.com>  Ryan Higgins <ryan.higgins@liblime.com>
+Ryan Higgins <rch@liblime.com>  rych <rych>
+saas <saas>  saas <saas>
+Salvador Zaragoza Rubio <salvazm@masmedios.com>  Salvador Zaragoza Rubio <salvazm@masmedios.com>
+savitra.sirohi <savitra.sirohi@osslabs.biz>  savitra.sirohi <savitra.sirohi@osslabs.biz>
+Savitra Sirohi <savitra.sirohi@osslabs.biz>  Savitra Sirohi <savitra.sirohi@osslabs.biz>
+Schuster <dschust1@gmail.com>  Schuster <dschust1@gmail.com>
+Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>  Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+sergerenaux <sergerenaux>  sergerenaux <sergerenaux>
+Serhij Dubyk {Сергій Дубик} <serhijdubyk@gmail.com>  Serhij Dubyk {Сергій Дубик} <serhijdubyk@gmail.com>
+shaunevans <shaunevans>  shaunevans <shaunevans>
+Stephen Hedges <shedges@myacpl.org>  shedges <shedges>
+Simon Blake <simon@katipo.co.nz>  simon <simon>
+MJ Ray <mjr@phonecoop.coop>  slef <slef>
+Sophie Meynieux <sophie.meynieux@biblibre.com>  Sophie Meynieux <sophie.meynieux@biblibre.com>
+Southeastern University <seu@ldmo02.ec2.liblime.com>  Southeastern University <seu@ldmo02.ec2.liblime.com>
+Srdjan Janković <srdjan@catalyst.net.nz>  Srdjan Jankovic <srdjan@catalyst.net.nz>
+Srdjan Janković <srdjan@catalyst.net.nz>  Srdjan Janković <srdjan@catalyst.net.nz>
+Stan Brinkerhoff <koha@brinkerhoff.org>  Stan Brinkerhoff <koha@brinkerhoff.org>
+Stan Brinkerhoff <stan@brinkerhoff.org>  stan <stan@brinkerhoff.org>
+Stan Brinkerhoff  <stan@koha-dev.hsd1.vt.comcast.net>  stan <stan@koha-dev.hsd1.vt.comcast.net>
+Stéphane Delaune <stephane.delaune@biblibre.com>  Stéphane Delaune <stephane.delaune@biblibre.com>
+Stephen Edwards <sedwards@alloycomputing.com>  Stephen Edwards <sedwards@alloycomputing.com>
+Steven Callender <stevecallender@esilibrary.com>  Steven Callender <stevecallender@esilibrary.com>
+Mason James <mason@katipo.co.nz>  sushi <sushi>
+szrj1m <szrj1m>  szrj1m <szrj1m>
+Tumer Garip <tgarip1957>  tgarip1957 <tgarip1957>
+Thatcher Rea <thatcher.rea@gmail.com>  Thatcher Rea <thatcher.rea@gmail.com>
+Thomas Dukleth <git@agogme.com>  thd <git@agogme.com>
+Thomas Dukleth <git@agogme.com>  thd <thd>
+Thomas Dukleth <git@agogme.com>  Thomas Dukleth <git@agogme.com>
+Paul Poulain <paul.poulain@biblibre.com>  tipaul <tipaul>
+Antoine Farnault <toins@biblibre.com>  toins <toins>
+Tomás Cohen Arazi <tomascohen@gmail.com>  Tomas Cohen Arazi <tomascohen@gmail.com>
+Tomás Cohen Arazi <tomascohen@gmail.com>  Tomás Cohen Arazi <tomascohen@gmail.com>
+Steve Tonnesen <tonnesen>  tonnesen <tonnesen>
+Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>  Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
+Vincent Danjean <Vincent.Danjean@ens-lyon.org>  Vincent Danjean <Vincent.Danjean@ens-lyon.org>
+Ward van Wanrooij <wvanwanrooij@nextfactory.nl>  Ward van Wanrooij <wvanwanrooij@nextfactory.nl>
+Will Stokes <will@catalyst.net.nz>  Will Stokes <will@catalyst.net.nz>
+Wolfgang Heymans <wolfgang.heymans@bsz-bw.de>  Wolfgang Heymans <wolfgang.heymans@bsz-bw.de>
+wolfpac444 <wolfpac444>  wolfpac444 <wolfpac444>
+Zach Sim <joseph.zachariah.sim@gmail.com>  Zach Sim <joseph.zachariah.sim@gmail.com>
+Zeno0 Tajoli <tajoli@cilea.it>  Zeno0 Tajoli <tajoli@cilea.it>
+Zeno Tajoli <tajoli@cilea.it>  Zeno Tajoli <tajoli@cilea.it>
+Zeno Tajoli <zeno@mail.cile>  Zeno Tajoli <zeno@mail.cile>
+zifox <zifox>  zifox <zifox>
+
 # This file maintains name/email mappings for git-shortlog use
 # For more information on the use of this file see: man git-shortlog
 # Mail to name mapping: email at the right is mapped to name at the left
 
-James Mason                     <mason@kohaaloha.com>
+Mason James                     <mason@kohaaloha.com>
 Henri-Damien Laurent            <henridamien.laurent@biblibre.com>
 Alex Arnaud                     <alex.arnaud@biblibre.com>
 Benjamin Rokseth                <bensinober@gmail.com>
@@ -50,6 +326,30 @@ Petter Goksøyr Åsen             <petter.goksoyr.asen@kul.oslo.kommune.no>
 Robin Sheat                     <robin@catalyst.net.nz>
 Srdjan Jankovic                 <srdjan@catalyst.net.nz>
 Tomás Cohen Arazi               <tomascohen@gmail.com>
+<connor.dewar@catalystacademy.net.nz> <connor.dewar@gmail.com>
+<sam-sanders@catalystacademy.net.nz> <sam-sanders@live.com>
+<jorgia@catalystacademy.net.nz> <jorgia_m_kelsey@hotmail.com>
+<bart@catalystacademy.net.nz> <bart.tj@gmail.com>
+<kate@catalystacademy.net.nz> <kate.h@paradise.net.nz>
+<jono@catalystacademy.net.nz> <reason.koan@gmail.com>
+<romanwilton@catalystacademy.net.nz> <romanwilton@gmail.com>
+<francesca@catalystacademy.net.nz> <francescalamoore@gmail.com>
+Alex Horsman <alex@catalystacademy.net.nz> <dhorsman@xtra.co.nz>
+Aleisha Amohia <aleisha@catalystacademy.net.nz> <aleishaamohia@hotmail.com>
+<emma@catalystacademy.net.nz> <emmaheath.student@wegc.school.nz>
+<tom@catalystacademy.net.nz> <thomas.houlker@hibs.school.nz>
+<mel@catalystacademy.net.nz> <manuelimel@gmail.com>
+<daniel@catalystacademy.net.nz> <daniel.barker.nz@gmail.com>
+johnboy <chansey.killer@catalystacademy.net.nz>  johnboy <chansey.killer@hotmail.com>
+Sam Sanders <sam-sanders@catalystacademy.net.nz>  Sam Sanders <sam-sanders@live.com>
+spartaness <spartan0042@catalystacademy.net.nz>  spartaness <spartan0042@hotmail.com>
+Morag Hills <moraghills@catalystacademy.net.nz> <the.invinnysible.one@gmail.com>
+Rochelle Healy <rochelle@catalystacademy.net.nz> <Rochelle_healy@hotmail.com>
+Thomas Wright <thomasw@catalystacademy.net.nz> <tomsStudy@gmail.com>
+Genevieve Plantin <genevieve.plantin@inlibro.com> genevieve <genevieve.plantin@inlibro.com>
+Barton Chittenden <barton@bywatersolutions.com> Barton <barton@bywatersolutions.com>
+
+Tomás Cohen Arazi               <tcohen@psi.unc.edu.ar>
 Tomás Cohen Arazi               <tomascohen@theke.io>
 Tomás Cohen Arazi               <tomascohen@unc.edu.ar>
 Bernardo González Kriegel       <bgkriegel@gmail.com>
@@ -61,12 +361,18 @@ Zeno Tajoli                     <ztajoli@gmail.com>
 Silvia Simonetti                <s.simonetti@cineca.it>
 Paola Rossi                     <paola.rossi@cineca.it>
 
+Blou <philippe.blouin@inlibro.com>  <philippe.blouin@inlibro.com>
+
 # Name to name mapping: the name in the right column will be mapped to the name in the left
 
 Chris Nighswonger               Chris R. Nighswonger
 Jared Camins-Esakov             Jared CAMINS-ESAKOV
 Fridolin Somers                 Fridolyn SOMERS
 
+
+
+
+
 # Mail to mail mapping: the email addy in the right column will be mapped to the email addy in the left
 
 <cnighswonger@foundations.edu>     <chris.nighswonger@gmail.com>
-- 
2.39.5