X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=.mailmap;h=ad53c95af8783be00d0adb78cb676d76245352e1;hb=0114465ced0d87aed51e8632e0ec1c005ae4fce3;hp=337e855f16ccdc5d9337330b8488c845789db0a2;hpb=866ddedfe1ddd6a31ab5749f6a0ccbf871eb98c2;p=koha.git

diff --git a/.mailmap b/.mailmap
index 337e855f16..ad53c95af8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +1,14 @@
 # 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>
 Alex Arnaud                     <alex.arnaud@biblibre.com>
+Benjamin Rokseth                <bensinober@gmail.com>
+Benjamin Rokseth                <benjamin.rokseth@kul.oslo.kommune.no>
+Charles Farmer                  <charles.farmer@inlibro.com>
+Charles Farmer                  <charles@inlibro.com>
 Chris Cormack                   <chrisc@catalyst.net.nz>
 Chris Nighswonger               <cnighswonger@foundations.edu>
 Colin Campbell                  <colin.campbell@ptfs-europe.com>
@@ -14,9 +18,11 @@ Frédéric Demians                <f.demians@tamil.fr>
 Frédérick Capovilla             <frederick.capovilla@libeo.com>
 Fridolin Somers                 <fridolin.somers@biblibre.com>
 Fridolin Somers                 <fridolyn.somers@biblibre.com>
+Fridolin Somers                 <fridolyn.somers@progilone.fr>
 Galen Charlton                  <gmc@esilibrary.com>
 Greg Barniskis                  <gbarniskis@gmail.com>
 Ian Walls                       <ian.walls@bywatersolutions.com>
+Holger Meißner                  <h.meissner.82@web.de>
 Janusz Kaczmarek                <januszop@gmail.com>
 Jared Camins-Esakov             <jcamins@cpbibliography.com>
 Jonathan Druart                 <jonathan.druart@biblibre.com>
@@ -26,23 +32,34 @@ Katrin Fischer                  <katrin.fischer@bsz-bw.de>
 Larry Baerveldt                 <larry@bywatersolutions.com>
 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                     <mtj@kohaaloha.com>
 Matthias Meusburger             <matthias.meusburger@biblibre.com>
+Maxime Beaulieu                 <mbeaulieu@inlibro.com>
 Maxime Pelletier                <maxime.pelletier@libeo.com>
 Meenakshi R                     <meenakshi.r@osslabs.biz>
 Nicole 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>
 Robin Sheat                     <robin@catalyst.net.nz>
 Srdjan Jankovic                 <srdjan@catalyst.net.nz>
 Tomás Cohen Arazi               <tomascohen@gmail.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>
 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>
 
 # Name to name mapping: the name in the right column will be mapped to the name in the left
 
@@ -52,12 +69,20 @@ 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>
-<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>
-<tcohen@psi.unc.edu.ar>         <tomascohen@gmail.com>
-<gonzalez@di.unc.edu.ar>        <bgkriegel@gmail.com>
-<fridolin.somers@biblibre.com>  <fridolyn.somers@biblibre.com>
+<cnighswonger@foundations.edu>     <chris.nighswonger@gmail.com>
+<frederick.capovilla@libeo.com>    <fredericiapovilla@sys-tech.net>
+<fridolin.somers@biblibre.com>     <fridolyn.somers@biblibre.com>
+<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>