From 10e5c34de75d20c18c2948dff44a0501b588df71 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Thu, 20 Nov 2014 14:43:26 -0300
Subject: [PATCH] [PASSED QA] Bug 13314: Fridolin and Simith fixes to the
 .mailmap file

As part of some tidying for the 3.18 release notes, I add this mappings.
To test run the command from the first comment before and after applying
the patch.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .mailmap | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.mailmap b/.mailmap
index f2a3744..337e855 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,6 +12,8 @@ D Ruth Bavousett                <ruth@bywatersolutions.com>
 David Cook                      <dcook@prosentient.com.au>
 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>
 Galen Charlton                  <gmc@esilibrary.com>
 Greg Barniskis                  <gbarniskis@gmail.com>
 Ian Walls                       <ian.walls@bywatersolutions.com>
@@ -40,11 +42,13 @@ Tomás Cohen Arazi               <tomascohen@gmail.com>
 Tomás Cohen Arazi               <tcohen@psi.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>
 
 # 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
 
@@ -56,3 +60,4 @@ Jared Camins-Esakov             Jared CAMINS-ESAKOV
 <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>
-- 
1.9.1