X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=.mailmap;h=a98467cd3258fd8b2d88c60901aa7e539acbbff9;hb=17de3a6feeed8237108c76ac2bf8e1cfddffc127;hp=cb837e2be76b61a680017a18e0dae8a2abf1b785;hpb=bb7ebf8c15b535e38fad4fbeb854406e50ec6e93;p=koha-ffzg.git

diff --git a/.mailmap b/.mailmap
index cb837e2be7..a98467cd32 100644
--- a/.mailmap
+++ b/.mailmap
@@ -62,6 +62,7 @@ Chris Nighswonger <cnighswonger@foundations.edu>              <cnighswonger@cnig
 Chris Nighswonger <cnighswonger@foundations.edu>              Koha User <koha@dev.(none)>
 Chris Nighswonger <cnighswonger@foundations.edu>              <chris.nighswonger@gmail.com>
 Christophe Croullebois                                        <christophe.croullebois@biblibre.com>
+Christophe Torin                                              <christophe.torin@univ-rennes2.fr>
 Claudia Forsman                                               <claudia.forsman@gmail.com>
 Colin Campbell                                                <colin.campbell@ptfs-europe.com>
 <connor.dewar@catalystacademy.net.nz>                         <connor.dewar@gmail.com>
@@ -174,7 +175,7 @@ Julian Maurice <julian.maurice@biblibre.com>                  koha <koha@cmspub1
 Julian Maurice <julian.maurice@biblibre.com>                  koha <koha@kohaprep1.di.u-psud.fr>
 Justin Vos                                                    <justinvos@live.com>
 <kate@catalystacademy.net.nz>                                 <kate.h@paradise.net.nz>
-Katrin Fischer <katrin.fischer@web.de>                        <katrin.fischer.83@web.de>
+Katrin Fischer <katrin.fischer.83@web.de>                     <katrin.fischer@web.de>
 Katrin Fischer                                                <katrin.fischer@bsz-bw.de>
 Katrin Fischer <katrin.fischer@bsz-bw.de>                     <Katrin.Fischer@bsz-bw.de>
 Katrin Fischer <katrin.fischer@bsz-bw.de>                     Koha <koha@koha-dev.de>
@@ -182,6 +183,7 @@ Kelly McElligott                                              <kelly@bywatersolu
 Kenza Zaki <kenza.zaki@biblibre.com>                          <root@kenza-VirtualBox>
 Kevin Carnes                                                  <kevin.carnes@ub.lu.se>
 Koha Translators                                              <root@translate.koha-community.org>
+Kris Wehipeihana                                              <kriswehipeihana@catalyst.net.nz>
 Kyle M Hall <kyle@bywatersolutions.com>                       <migrations@bywatersolutions.com>
 Kyle M Hall <kyle@bywatersolutions.com>                       <“staff@bywatersolutions.com”>
 Kyle M Hall <kyle@bywatersolutions.com>                       John Doe <you@example.com>