X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=.mailmap;h=09f5e6e499c7bd18841974008bda8e78ae564d41;hb=7df2b5df3d6c48b35c73a9e840d8e8ef395b11f6;hp=0537484b55d011f8ae683be0d6a1673c140ccd64;hpb=f8213ab0b684ec79699406e21a8fc61512591017;p=dbsrgits%2FDBIx-Class.git

diff --git a/.mailmap b/.mailmap
index 0537484..09f5e6e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,8 @@
 # so if someone were to legally change their name, we could use it to fix that
 # while maintaining the integrity of the repository
 
+# https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors
+
 Alexander Hartmaier <abraxxa@cpan.org>      <alexander.hartmaier@t-systems.at>
 Amiri Barksdale <amiribarksdale@gmail.com>  <amiri@metalabel.com>
 Andrew Rodland <andrew@cleverdomain.org>    <arodland@cpan.org>
@@ -10,20 +12,25 @@ Brendan Byrd <Perl@ResonatorSoft.org>       <byrd.b@insightcom.com>
 Brendan Byrd <Perl@ResonatorSoft.org>       <GitHub@ResonatorSoft.org>
 Brendan Byrd <Perl@ResonatorSoft.org>       <perl@resonatorsoft.org>
 Brian Phillips <bphillips@cpan.org>         <bphillips@digitalriver.com>
+Dagfinn Ilmari Mannsåker <ilmari@ilmari.org><ilmari.mannsaker@net-a-porter.com>
 David Kamholz <dkamholz@cpan.org>           <davekam@pobox.com>
-David Schmidt <davewood@gmx.at>             <d.schmidt@tripwolf.com>
-David Schmidt <davewood@gmx.at>             <dt@univie.ac.at>
+David Schmidt <mail@davidschmidt.at>        <d.schmidt@tripwolf.com>
+David Schmidt <mail@davidschmidt.at>        <dt@univie.ac.at>
+David Schmidt <mail@davidschmidt.at>        <davewood@gmx.at>
 Devin Austin <dhoss@cpan.org>               <devin.austin@gmail.com>
+Duncan Garland <Duncan.Garland@motortrak.com> <duncan@duncan-laptop.(none)>
 Felix Antonius Wilhelm Ostmann <sadrak@cpan.org>  <ostmann@sadraksaemp.intern4.websuche.de>
 Gerda Shank <gshank@cpan.org>               <gerda.shank@gmail.com>
 Gianni Ceccarelli <dakkar@thenautilus.net>  <gianni.ceccarelli@net-a-porter.com>
 Gordon Irving <goraxe@cpan.org>             <goraxe@goraxe.me.uk>
 Hakim Cassimally <osfameron@cpan.org>       <hakim@vm-participo.(none)>
 Jonathan Chu <milki@rescomp.berkeley.edu>   <milki@rescomp.berkeley.edu>
+Jose Luis Martinez <jlmartinez@capside.com> <jlmartinez@capside.com>
 Matt Phillips <mattp@cpan.org>              <mphillips@oanda.com>
 Norbert Csongrádi <bert@cpan.org>           <bert@cpan.org>
-Roman Filippov <romanf@cpan.org>            <moltar@moltar.net>
 Peter Rabbitson <ribasushi@cpan.org>        <rabbit@viator.rabbit.us>
+Roman Filippov <romanf@cpan.org>            <moltar@moltar.net>
+Samuel Kaufman <sam@socialflow.com>         <sam@socialflow.com>
 Tim Bunce <Tim.Bunce@pobox.com>             <Tim.Bunce@ig.co.uk>
 Toby Corkindale <tjc@cpan.org>              <toby@dryft.net>
 Wallace Reis <wreis@cpan.org>               <wallace@reis.org.br>