(travis) Remove makefile fixup, now hardcoded in the subrepo

[dbsrgits/DBIx-Class.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index ffbbe5d..3a45040 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@
 
 Alexander Hartmaier <abraxxa@cpan.org>      <alexander.hartmaier@t-systems.at>
 Alexander Kuznetsov <acca@cpan.org>         <acca(at)cpan.org>
+Alastair McGowan-Douglas <alastair.douglas@gmail.com> <alastair.mcgowan@opusvl.com>
 Amiri Barksdale <amiribarksdale@gmail.com>  <amiri@metalabel.com>
 Andrew Rodland <andrew@cleverdomain.org>    <arodland@cpan.org>
 Arthur Axel "fREW" Schmidt                  <frioux@gmail.com>
@@ -14,9 +15,11 @@ 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>
+C.J. Adams-Collier <cjcollier@cpan.org>     <carl.j.adamscollier.-nd@disney.com>
 Christian Walde <walde.christian@gmail.com> <walde.christian@googlemail.com>
 Jess Robinson <castaway@desert-island.me.uk><no-email-available@dev.catalystframework.org>
 Dagfinn Ilmari Mannsåker <ilmari@ilmari.org><ilmari.mannsaker@net-a-porter.com>
+Damien Krotkine <dams@cpan.org>             <dkrotkine@weborama.com>
 David Kamholz <dkamholz@cpan.org>           <davekam@pobox.com>
 David Schmidt <mail@davidschmidt.at>        <d.schmidt@tripwolf.com>
 David Schmidt <mail@davidschmidt.at>        <dt@univie.ac.at>
@@ -35,11 +38,14 @@ Jonathan Chu <milki@rescomp.berkeley.edu>   <milki@rescomp.berkeley.edu>
 Jose Luis Martinez <jlmartinez@capside.com> <jlmartinez@capside.com>
 Kent Fredric <kentnl@cpan.org>              <kentfredric@gmail.com>
 Matt Phillips <mattp@cpan.org>              <mphillips@oanda.com>
+Matt Phillips <mattp@cpan.org>              <matt@raybec.com>
+Michael Reddick <michael.reddick@gmail.com> <michaelr@michaelr-desktop.(none)>
 Norbert Csongrádi <bert@cpan.org>           <bert@cpan.org>
 Peter Rabbitson <ribasushi@cpan.org>        <rabbit@viator.rabbit.us>
 Roman Filippov <romanf@cpan.org>            <moltar@moltar.net>
 Ronald J Kimball <rjk@tamias.net>           <rkimball@pangeamedia.com>
 Samuel Kaufman <sam@socialflow.com>         <sam@socialflow.com>
+Sebastian Willert <willert@cpan.org>        <willert@gmail.com>
 Tim Bunce <tim.bunce@pobox.com>             <Tim.Bunce@ig.co.uk>
 Toby Corkindale <tjc@cpan.org>              <toby@dryft.net>
 Tommy Butler <tbutler.cpan.org@internetalias.net> <tommybutler@users.noreply.github.com>