X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=.mailmap;h=5a87fa02ea9963fcd961d0283105233444085e15;hb=1131bb687f14fef7b4cb5f3b194711e85f9227af;hp=f9a4d7cc5c8d7d69b14acede82d3b36f99a5bc40;hpb=d253ec12997d0ae2fc982036f421125c6ae20756;p=koha-ffzg.git

diff --git a/.mailmap b/.mailmap
index f9a4d7cc5c..5a87fa02ea 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,53 +1,477 @@
+Al Banks <ahbanks>  ahbanks <ahbanks>
+H. Passini <hpassini>  hpassini <hpassini>
+Alan Millar <amillar>  amillar <amillar>
+Bruno Toumi <btoumi>  btoumi <btoumi>
+Pierre Cauchois <cauchoip>  cauchoip <cauchoip>
+doXulting <doxulting>  doxulting <doxulting>
+Benedict P. Barszcz <kb2qzv>  kb2qzv <kb2qzv>
+fisheye <fisheye>  fisheye <fisheye>
+Francisco M. Marzoa Alonso <fmmarzoa>  fmmarzoa <fmmarzoa>
+Gavin McCullagh <gmccullagh>  gmccullagh <gmccullagh>
+Friedrich zur Hellen <hellen>  hellen <hellen>
+Jérome Vizcaino <plugz>  plugz <plugz>
+Ambrose Li <ambrose.li@gmail.com>  acli <acli>
+Mike Mylonas <dragon28@ihug.co.nz>  dragon28 <dragon28>
+Pierrick 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>
+Arnaud Laurin <alaurin@biblibre.com>  alaurin <alaurin@biblibre.com>
+Arnaud Laurin <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>
+Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>  A. Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>
+Alex Arnaud <alex.arnaud@biblibre.com>  = <=>
+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>
+Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no> Koha instance knakk-koha <knakk-koha@vagrant-saucy64>
+BibLibre Team <dev_patches@biblibre.com>
+BibLibre Team <koha@biblibre.com>
+BibLibre Team <root@jbilou.biblibre.local>
+ByWater Solutions Team <staff@bywatersolutions.com>
+Robert Lyon <bob_lyon@katipo.co.nz>  bob_lyon <bob_lyon>
+Brendan Gallagher <brendan@bywatersolutions.com>  Brendan A. Gallagher <brendan@bywatersolutions.com>
+Brendan Gallagher <brendan@bywatersolutions.com>  Brendan A. Gallagher <info@bywatersolutions.com>
+Brendan Gallagher <brendan@bywatersolutions.com>  brendan <brendan@bywatersolutions.com>
+Brendan Gallagher <brendan@bywatersolutions.com>  brendan <info@bywatersolutions.com>
+Brendan Gallagher <brendan@bywatersolutions.com>  Brendan <info@bywatersolutions.com>
+Brendan Gallagher <brendan@bywatersolutions.com>  ByWater Solutions <brendan@bywatersolutions.com>
+Brendan Gallagher <brendan@bywatersolutions.com>  Brendan Gallagher <info@bywatersolutions.com>
+Brendan Gallagher <brendan@bywatersolutions.com>  Brendan Gallagher <brendan@bywatersolutions.com>
+Brendan Gallagher <brendan@bywatersolutions.com>  Brendan A 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>
+Brice Sanchez <brice.sanchez@sys-tech.net>  Bryce Sanchez <brice.sanchez@sys-tech.net>
+Brice Sanchez <brice.sanchez@sys-tech.net>  koha-preprod <koha-preprod@sys-tech.net>
+Kyle M Hall <kyle@bywatersolutions.com>  “ByWater <“staff@bywatersolutions.com”>
+Kyle M Hall <kyle@bywatersolutions.com>  “ByWater <“staff@bywatersolutions.com”>
+Kyle M Hall <kyle@bywatersolutions.com>  ByWater Migration Support <migrations@bywatersolutions.com>
+Kyle M Hall <kyle@bywatersolutions.com>  John Doe <you@example.com>
+Caroline Cyr La Rose <caroline@inlibro.com>  caroline <caroline@inlibro.com>
+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@catalyst.net.nz>  Chris chrisc@catalyst.net.nz
+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>
+Chris Cormack <chris@bigballofwax.co.nz> Chris <chris@bigballofwax.co.nz>
+Chris 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>
+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>
+Emma Nakamura Smith <emma.nakamura.smith@gmail.com>  Your Full Name <your_email>
+Emma Nakamura Smith <emma.nakamura.smith@gmail.com>
+Emmi Takkinen  <emmi.takkinen@outlook.com>
+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>
+Waylon Robertson <genji@katipo.co.nz>  genjimoto <genjimoto>
+Genevieve Plantin <genevieve.plantin@inlibro.com>  genevieve <genevieve@inlibro.com>
+Genevieve Plantin <genevieve.plantin@inlibro.com>  genevieve <genevieve.plantin@inlibro.com>
+Greg Barniskis <gbarniskis@gmail.com>  Greg Barniskis <gbarniskis@gmail.com>
+Gus Ellerm <gel1163@stacmail.net>  Gus <gel1163@stacmail.net>
+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>
+Henri-Damien LAURENT <henridamien.laurent@biblibre.com>  root <root@henridamienlaurent.dyndns.org>
+Henri-Damien LAURENT <henridamien.laurent@biblibre.com>  root <root@descartes.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>
+Ian Walls <hsl@nyumc.org>
+Indranil Das Gupta <indradg@l2c2.co.in>  Indranil Das Gupta (L2C2 Technologies) <indradg@l2c2.co.in>
+Mason James <mason@kohaaloha.com>  JAMES Mason <mason@kohaaloha.com>
+Jane Wagner <jwagner@ptfs.com>  dev2 <dev2@debKOHA2.corporate.ptfs.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>
+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 <joe.atzberger@liblime.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>
+Josef Moravec <josef.moravec@gmail.com>  kohamaster <preprod@kohaVM>
+Joshua Ferraro <jmf@liblime.com>  joshferraro <joshferraro>
+Joshua Ferraro <jmf@liblime.com>  Joshua Ferraro <jmf@liblime.com>
+Joshua Ferraro <jmf@liblime.com>  hcpl test <koha-test@koha.hclibrary.org>
+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>
+Julian Maurice <julian.maurice@biblibre.com>  koha <koha@cmspub1.di.u-psud.fr>
+Julian Maurice <julian.maurice@biblibre.com>  koha <koha@kohaprep1.di.u-psud.fr>
+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>
+Katrin Fischer <Katrin.Fischer@bsz-bw.de>  Koha <koha@koha-dev.de>
+Kyle M Hall <kyle@bywatersolutions.com>  koha <koha@false.(none)>
+Kyle M Hall <kyle@bywatersolutions.com>  koha <koha@localhost.(none)>
+Joshua Ferraro <jmf@liblime.com>   Koha Production <koha-pro@koha-01.hclibrary.org>
+Chris Nighswonger <cnighswonger@foundations.edu>  Koha User <koha@dev.(none)>
+Chris Nighswonger <cnighswonger@foundations.edu>  Christopher Nighswonger <cnighswonger@cnighswonger-dt.(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.m.hall@gmail.com>  Kyle Hall <kyle@bywatersolutions.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>
+Kyle M Hall <kyle.m.hall@gmail.com>  Koha user <koha@mtpl.bywatersolutions.com>
+Larry Baerveldt <larry@bywatersolutions.com>  Larry Baerveldt <larry@bywatersolutions.com>
+Lars Wirzenius <lars@catalyst.net.nz>  Lars Wirzenius <lars@catalyst.net.nz>
+David Strainchamps <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 <wizzyrea@gmail.com>  Liz <wizzyrea@gmail.com>
+Liz Rea <liz@catalyst.net.nz>  Liz <liz@catalyst.net.nz>
+Lyon 3 Team <koha@univ-lyon3.fr>  Lyon3 Team <koha@univ-lyon3.fr>
+Lyon 3 Team <koha@univ-lyon3.fr>  Lyon3 Team <preprod@koha.(none)>
+Lyon 3 Team <koha@univ-lyon3.fr>  Koha Team Lyon 3 <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>
+Morgane Alonso <morgane.alonso@biblibre.com>  morgane alonso <morgane.alonso@biblibre.com>
+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>
+Nicholas Van Oudtshoorn  <vanoudt@gmail.com>
+Nick Clemens <nick@bywatersolutions.com>  Nick <nick@bywatersolutions.com>
+Nick Clemens <nick@bywatersolutions.com>  Koha instance kohadev-koha <kohadev-koha@kohadevbox>
+Nick Clemens <nick@bywatersolutions.com>  root <root@f1ebe1bec40>
+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 <nce@liblime.com>  Nicole Engard <nce@liblime.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>
+Nicole C. Engard <nicole@bywatersolutions.com>  Nicole Engard <nce@arwen.metavore.com>
+Nicole C. Engard <nicole@bywatersolutions.com>  Nicole Engard <nce@liblime.com>
+Nicole C. Engard <nicole@bywatersolutions.com>  Nicole Engard <nengard@bywatersolutions.com>
+Nicole C. Engard <nicole@bywatersolutions.com>  Nicole Engard <nengard@gmail.com>
+Nicole C. Engard <nicole@bywatersolutions.com>  Nicole Engard <nicole@bywatersolutions.com>
+Nicole C. Engard <nicole@bywatersolutions.com>  Nicole <nicole@bywatersolutions.com>
+Nuño López Ansótegui <nunyo@masmedios.com>  Nuño López Ansótegui <nunyo@masmedios.com>
+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>
+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)>
+Frédérick Capovilla <frederick.capovilla@sys-tech.net>  preprod34 <preprod34@koha.ccsr.qc.ca>
+Frédérick Capovilla <frederick.capovilla@sys-tech.net>  koha <koha@koha.sys-tech.net>
+PTFS <koha-dev@ptfs.com>  PTFS <koha-dev@ptfs.com>
+Mason James <mtj@kohaaloha.com>  QA Manager <patches@koha.org>
+Rachel Hamilton-Williams <rachel@katipo.co.nz>  rachelkatipo <rachelkatipo>
+Chris Cormack <chris@katipo.co.nz>  rangi <rangi>
+Remi Mayrand-Provencher <remi.mayrand-provencher@inLibro.com>  remi <remi.mayrand-provencher@inLibro.com>
+Reed Wade <reed@catalyst.net.nz>  Reed Wade <reed@catalyst.net.nz>
+Ricardo Dias Marques <koha@ricmarques.net>  Ricardo Dias Marques <koha@ricmarques.net>
+Richard Anderson <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>
+Chris Nighswonger <chris.nighswonger@gmail.com>  root <root@fbcit.campus.foundations.edu>
+Kenza Zaki <kenza.zaki@biblibre.com>  root <root@kenza-VirtualBox>
+Liz Rea <wizzyrea@gmail.com>  root <root@lists.nekls.org>
+Liz Rea <wizzyrea@gmail.com>  root <root@liz-koha.nekls.org>
+Joshua Ferraro <jmf@liblime.com>  root <root@mail.oplin.org>
+Marcel de Rooy <m.de.rooy@rijksmuseum.nl>  <root <root@master.rijkskoha.nl>
+Darrell Ulm <darrellulm@smfpl.org>  root <root@newkoha32.local>
+Darrell Ulm <darrellulm@smfpl.org>  koha <koha@smfpl.org>
+Joshua Ferraro <jmf@liblime.com>  root <root@snaga.liblime.co.nz>
+Elliott Davis <tdavis@uttyler.edu>  root <root@test.bywatersolutions.com>
+David Gustafsson  <root@f1ebe1bec408>
+Koha Translators <root@translate.koha-community.org>  root <root@translate.koha-community.org>
+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@balrog.liblime.com>  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>
+Roger Buck <saas>  saas <saas>
+Salvador Zaragoza Rubio <salvazm@masmedios.com>  Salvador Zaragoza Rubio <salvazm@masmedios.com>
+David Schuster <dschust1@gmail.com>  Schuster <dschust1@gmail.com>
+Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>  Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
+Serge Renaux <sergerenaux>
+Сергій Дубик {Serhij Dubyk}  <serhijdubyk@gmail.com>
+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>
+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>  Stephane 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>
+Mason James <mason@katipo.co.nz>  szrj1m <szrj1m>
+Tümer 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>
+Mike Hansen <wolfpac444>  wolfpac444 <wolfpac444>
+Zach Sim <joseph.zachariah.sim@gmail.com>  Zach Sim <joseph.zachariah.sim@gmail.com>
+Zeno 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>
+
 # This file maintains name/email mappings for git-shortlog use
-# For more information on the use of this file see '$ git shortlog -h'
-# Name to mail mapping: the name in the right column will be mapped to the email addy in the left
+# 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>
-Henri-Damien Laurent            <henridamien.laurent@biblibre.com>
+Ahmed                           <ahmed@inlibro.com>
+Abby Robertson                  <abbyrobnz@gmail.com>
+Briana Greally                  <brianagreally@gmail.com>
+Alberto Martinez                <martinez.alberto@icloud.com>
 Alex Arnaud                     <alex.arnaud@biblibre.com>
+Benjamin Rokseth                <bensinober@gmail.com>
+Benjamin Rokseth                <benjamin.rokseth@kul.oslo.kommune.no>
+Brandon Haveman                 <brandon_h27@hotmail.com>
+Charles Farmer                  <charles.farmer@inlibro.com>
+Charles Farmer                  <charles@inlibro.com>
 Chris Cormack                   <chrisc@catalyst.net.nz>
 Chris Nighswonger               <cnighswonger@foundations.edu>
+Claudia Forsman                 <claudia.forsman@gmail.com>
 Colin Campbell                  <colin.campbell@ptfs-europe.com>
 D Ruth Bavousett                <ruth@bywatersolutions.com>
 David Cook                      <dcook@prosentient.com.au>
-Frédéric Demians                <f.demians@tamil.fr>
+Eric Phetteplace                <phette23@gmail.com>
+Fernando Canizo                 <conan@lugmen.org.ar>
 Frédérick Capovilla             <frederick.capovilla@libeo.com>
+Frédéric Demians                <f.demians@tamil.fr>
+Frédéric Durand                 <frederic.durand@univ-lyon2.fr>
+Fridolin Somers                 <fridolin.somers@biblibre.com>
+Fridolin Somers                 <fridolyn.somers@biblibre.com>
+Fridolin Somers                 <fridolyn.somers@progilone.fr>
+Fridolin Somers <fridolin.somers@biblibre.com>  Admin User Koha <koha@localhost>
 Galen Charlton                  <gmc@esilibrary.com>
 Greg Barniskis                  <gbarniskis@gmail.com>
+Henri-Damien LAURENT            <henridamien.laurent@biblibre.com>
+Helene Hickey                   <hickeyhe@wgc.school.nz>
+Holger Meißner                  <h.meissner.82@web.de>
 Ian Walls                       <ian.walls@bywatersolutions.com>
 Janusz Kaczmarek                <januszop@gmail.com>
 Jared Camins-Esakov             <jcamins@cpbibliography.com>
-Jonathan Druart                 <jonathan.druart@biblibre.com>
+Jatara Barnes                   <jendayi30@gmail.com>
+Jérôme Charaoui                 <jcharaoui@cmaisonneuve.qc.ca>
+Jonathan Druart                 <jonathan.druart@bugs.koha-community.org>
+Joe Sikowitz                    <joe@flo.org>
 Joy Nelson                      <joy@bywatersolutions.com>
 Juan Sieira                     <juan.sieira@xercode.es>
+Justin Vos                      <justinvos@live.com>
 Katrin Fischer                  <katrin.fischer@bsz-bw.de>
 Larry Baerveldt                 <larry@bywatersolutions.com>
+Leire Diez                      <leire@scanbit.net>
 Liz Rea                         <lrea@nekls.org>
-MJ Ray                          <mjr@phonecoop.coop>
+Magnus Enger                    <digitalutvikling@gmail.com>
 Magnus Enger                    <magnus@enger.priv.no>
+Magnus Enger                    <magnus.enger@kul.oslo.kommune.no>
 Marcel de Rooy                  <m.de.rooy@rijksmuseum.nl>
 Marcel de Rooy                  <marcel@libdevelop.rijksmuseum.nl>
+Mason James                     <mason@kohaaloha.com>
 Mason James                     <mtj@kohaaloha.com>
 Matthias Meusburger             <matthias.meusburger@biblibre.com>
+Maxime Beaulieu                 <mbeaulieu@inlibro.com>
+Maxime Beaulieu                 <maxime.beaulieu@inlibro.com>
 Maxime Pelletier                <maxime.pelletier@libeo.com>
 Meenakshi R                     <meenakshi.r@osslabs.biz>
-Nicole Engard                   <nengard@bywatersolutions.com>
+Mengü Yazıcıoğlu                <kohadevinim@devinim.com.tr>
+Merllissia Manueli              <manuelimel@gmail.com>
+MJ Ray                          <mjr@phonecoop.coop>
+Nazlı Çetin                     <nazli@devinim.com.tr>
+Nguyen Duy Tinh                 <duy-tinh.nguyen@biblibre.com>
+Nicole C. Engard                <nengard@bywatersolutions.com>
 Owen Leonard                    <oleonard@myacpl.org>
 Paul Poulain                    <paul.poulain@biblibre.com>
+Petter Goksøyr Åsen             <boutrosboutrosboutros@gmail.com>
+Petter Goksøyr Åsen             <petter.goksoyr.asen@kul.oslo.kommune.no>
+Philippe Audet-Fortin           <philippe.audet-fortin@inlibro.com>
+Pongtawat Chippimolchai         <pongtawat@punsarn.asia>
+Radek Å iman                     <radek.siman@centrum.cz>
+Raewyn Adams                    <raewyn.adams@bopdhb.govt.nz>
 Robin Sheat                     <robin@catalyst.net.nz>
-Srdjan Jankovic                 <srdjan@catalyst.net.nz>
+Savitra Sirohi                  <savitra.sirohi@osslabs.biz>
+Séverine Queune                 <severine.queune@bulac.fr>
+शंतनू {Shantanoo}                 <shantanoo@gmail.com>
+Sonia Lemaire                   <sonia.lemaire@biblibre.com>
+Srdjan Janković                 <srdjan@catalyst.net.nz>
 Tomás Cohen Arazi               <tomascohen@gmail.com>
+Victor Grousset                 <victor@tuxayo.net>
+<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>
+Alexandra 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 Barker <daniel@catalystacademy.net.nz>  <daniel.barker.nz@gmail.com>
+John Copeland <chansey.killer@catalystacademy.net.nz>  johnboy <chansey.killer@hotmail.com>
+Sam Sanders <sam-sanders@catalystacademy.net.nz>  Sam Sanders <sam-sanders@live.com>
+John Copeland <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>
+Johan Larsson <johan.larsson@ub.gu.se>  xljoha <johan.larsson@ub.gu.se>
+Wajasu  <matted-34813@mypacks.net>
+
+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>
+Bernardo González Kriegel       <gonzalez@di.unc.edu.ar>
+Simith D'Oliveira               <simith@inlibro.com>
+Zeno Tajoli                     <z.tajoli@cineca.it>
+Zeno Tajoli                     <tajoli@cilea.it>
+Zeno Tajoli                     <ztajoli@gmail.com>
+Silvia Simonetti                <s.simonetti@cineca.it>
+Paola Rossi                     <paola.rossi@cineca.it>
+Shaun Evans                     <shaunevans>
+Pawel Skuza                     <pawelzc>
+Michel Lerenard                 <zifox>
+
+Philippe Blouin  <philippe.blouin@inlibro.com>
+
+D Ruth Bavousett  <David.Bavousett@liblime.com>
+D Ruth Bavousett  <dbavousett@ptfs.com>
+D Ruth Bavousett  <jdb@arwen.metavore.com>
+D Ruth Bavousett  <druthb@gmail.com>
+D Ruth Bavousett  <ruth@bywatersolutions.com>
+D Ruth Bavousett  <David.Bavousett@liblime.com>
+D Ruth Bavousett <dbavousett@ptfs.com>  PTFS Contractor <dbavousett@ptfs.com>
+D Ruth Bavousett <dbavousett@ptfs.com>  PTFS <koha-dev@ptfs.com>
+Father Vlasie <fv@spots.school>  <fv@spots.school>
+Samuel Crosby  <scrosby000@gmail.com>
+Agustín Moyano  <agustinmoyano@theke.io>
+Dobrica Pavlinušić  <dpavlin@rot13.org>
+Héctor Castro  <hector.hecaxmmx@gmail.com>
+Marc Véron  <veron@veron.ch>
+Julian Fiol  <julian.fiol@biblibre.com>
+Vitor Fernandes  <vfernandes@keep.pt>
+Chloe Alabaster  <chloealabaster@gmail.com>
+
+Daniel Banzli  <daniel.buenzli@erratique.ch>
 
 # 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
+Mason James                     <szrj5m>
+Dorian Meid                     <dnmeid>
+
 
 # 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>
-<frederick.capovilla@libeo.com> <fredericiapovilla@sys-tech.net>
-<katrin.fischer@bsz-bw.de>      <Katrin.Fischer.83@web.de>
-<jcamins@cpbibliography.com>    <jcamins@bywatersolutions.com>
-<jcamins@cpbibliography.com>    <camins@numismatics.org>
-<jcamins@cpbibliography.com>    <koha@cpbibliography.com>
+<cnighswonger@foundations.edu>     <chris.nighswonger@gmail.com>
+<frederick.capovilla@libeo.com>    <fredericiapovilla@sys-tech.net>
+<gonzalez@di.unc.edu.ar>           <bgkriegel@gmail.com>
+<holger.meissner@hs-gesundheit.de> <h.meissner.82@web.de>
+<jcamins@cpbibliography.com>       <jcamins@bywatersolutions.com>
+<jcamins@cpbibliography.com>       <camins@numismatics.org>
+<jcamins@cpbibliography.com>       <koha@cpbibliography.com>
+<katrin.fischer@bsz-bw.de>         <Katrin.Fischer.83@web.de>
+<tomascohen@theke.io>              <tomascohen@gmail.com>
+<magnus.enger@kul.oslo.kommune.no> <digitalutvikling@gmail.com>
+<petter.goksoyr.asen@kul.oslo.kommune.no> <boutrosboutrosboutros@gmail.com>
+<benjamin.rokseth@kul.oslo.kommune.no>    <bensinober@gmail.com>
+<z.tajoli@cineca.it>               <tajoli@cilea.it>
+<z.tajoli@cineca.it>               <ztajoli@gmail.com>
+<m.de.rooy@rijksmuseum.nl>         <M.de.Rooy@rijksmuseum.nl>
+<m.de.rooy@rijksmuseum.nl>         <marcel@libdevelop.rijksmuseum.nl>