X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=.mailmap;h=ad53c95af8783be00d0adb78cb676d76245352e1;hb=764b8b7e905e541a8e6de65a94f2ceed0fdef111;hp=525d5a1a3dcde5eae7f6d6d942fd4f2885b87ad8;hpb=08482a70f8db5757614b7f23efaf457445b76dd8;p=koha.git

diff --git a/.mailmap b/.mailmap
index 525d5a1a3d..ad53c95af8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,6 @@
 # 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>
@@ -50,7 +50,8 @@ 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>
@@ -77,9 +78,11 @@ Fridolin Somers                 Fridolyn SOMERS
 <jcamins@cpbibliography.com>       <camins@numismatics.org>
 <jcamins@cpbibliography.com>       <koha@cpbibliography.com>
 <katrin.fischer@bsz-bw.de>         <Katrin.Fischer.83@web.de>
-<tcohen@psi.unc.edu.ar>            <tomascohen@gmail.com>
+<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>