From 670a21d34f67a983373925abbabc618cfea0d1ae Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi <tomascohen@gmail.com> Date: Mon, 24 Nov 2014 10:09:38 -0300 Subject: [PATCH] [PASSED QA] Bug 13314: attribute Oslo Public Library Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Signed-off-by: Magnus Enger <digitalutvikling@gmail.com> Fixes names and mappings for contributors from Oslo Public Library. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> --- .mailmap | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.mailmap b/.mailmap index f279897..b2ab0b1 100644 --- a/.mailmap +++ b/.mailmap @@ -5,6 +5,8 @@ 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> Chris Cormack <chrisc@catalyst.net.nz> Chris Nighswonger <cnighswonger@foundations.edu> Colin Campbell <colin.campbell@ptfs-europe.com> @@ -28,7 +30,9 @@ 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> @@ -38,6 +42,8 @@ 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> @@ -64,3 +70,6 @@ Fridolin Somers Fridolyn SOMERS <jcamins@cpbibliography.com> <koha@cpbibliography.com> <katrin.fischer@bsz-bw.de> <Katrin.Fischer.83@web.de> <tcohen@psi.unc.edu.ar> <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> -- 1.9.1