Update .mailmap, copy from dolfin.

Martin Sandve Alnæs · Martin Sandve Alnæs · commit b1847e708e67 · 2016-08-05T15:07:55.000+02:00
diff --git a/.mailmap b/.mailmap
@@ -1,11 +1,132 @@
-Martin Sandve Alnæs <martinal@simula.no>
-Martin Sandve Alnæs <martinal@simula.no> <martinal@localhost>
-Martin Sandve Alnæs <martinal@simula.no> <martinal@martinal-desktop>
 Anders Logg <logg@chalmers.se>
+Anders Logg <logg@chalmers.se> <ffc@bamse>
+Anders Logg <logg@chalmers.se> <logg@yavanna>
+Anders Logg <logg@chalmers.se> <logg@aule>
+Anders Logg <logg@chalmers.se> logg <logg@localhost.localdomain>
+Anders Logg <logg@chalmers.se> fenics <devnull@localhost>
+Anders Logg <logg@chalmers.se> hg <hg@numenor>
+Anders Logg <logg@chalmers.se> root <root@leja>
 Anders Logg <logg@chalmers.se> <logg@glaurung>
 Anders Logg <logg@chalmers.se> <logg@simula.no>
-Kristian B. Ølgaard <k.b.oelgaard@gmail.com>
-Kristian B. Ølgaard <k.b.oelgaard@gmail.com> <k.b.oelgaard@tudelft.nl>
+Anders Logg <logg@chalmers.se> <anders.logg+bitbucket@gmail.com>
+Anders Logg <logg@chalmers.se> <logg@olorin>
+Anders Logg <logg@chalmers.se> <logg@tti-c.org>
+Anders Logg <logg@chalmers.se> anders <anders@localhost.localdomain>
+Anders Logg <logg@chalmers.se> logg <devnull@localhost>
+Anders Logg <logg@chalmers.se> logg <logg@bigblue.simula.no>
+Anders Logg <logg@chalmers.se> logg <logg@bunjil.simula.no>
+Anders Logg <logg@chalmers.se> logg <logg@olorin>
+Andy R. Terrel <andy.terrel@gmail.com>
+Andy R. Terrel <andy.terrel@gmail.com> <aterrel@uchicago.edu>
+Andy R. Terrel <andy.terrel@gmail.com> aterrel <devnull@localhost>
+Andy R. Terrel <andy.terrel@gmail.com> <aterrel@dhcp-11-20.cs.uchicago.edu>
+Benjamin Kehlet <benjamik@simula.no>
+Benjamin Kehlet <benjamik@simula.no> <benjamik@benjamik-hp.simula.no>
+Benjamin Kehlet <benjamik@simula.no> <benjamik@ifi.uio.no>
+Benjamin Kehlet <benjamik@simula.no> <benjamik@login.ifi.uio.no>
+Benjamin Kehlet <benjamik@simula.no> <bkehlet@bkehlet-laptop>
+Chris Richardson <chris@bpi.cam.ac.uk>
+Chris Richardson <chris@bpi.cam.ac.uk> chris <chris@Lenovo-Edge.(none)>
+Chris Richardson <chris@bpi.cam.ac.uk> Chris Richardson <bpi.cam.ac.uk>
+Chris Richardson <chris@bpi.cam.ac.uk> root <root@bpi.cam.ac.uk>
+Corrado Maurini <corrado.maurini@upmc.fr>
+Corrado Maurini <corrado.maurini@upmc.fr> <cmaurini@gmail.com>
+Dag Lindbo <dag@csc.kth.se>
+Dag Lindbo <dag@csc.kth.se> dag <dag@dag-laptop>
+Dag Lindbo <dag@csc.kth.se> dag <dag@na55.nada.kth.se>
+David Ham <david.ham@imperial.ac.uk>
+David Ham <david.ham@imperial.ac.uk> david.ham@imperial.ac.uk <>
+Evan Lezar <evanlezar@gmail.com>
+Evan Lezar <evanlezar@gmail.com> <mail@evanlezar.com>
+Evan Lezar <evanlezar@gmail.com> elezar <elezar@labby>
+Evan Lezar <evanlezar@gmail.com> elezar <elezar@lefauve>
+Fredrik Valdmanis <fredrik@valdmanis.com>
+Fredrik Valdmanis <fredrik@valdmanis.com> Fredrik Valdmanis <fredva@ifi.uio.no>
+Garth N. Wells <gnw20@cam.ac.uk>
+Garth N. Wells <gnw20@cam.ac.uk> root <root@fornax.esc.cam.ac.uk>
+Garth N. Wells <gnw20@cam.ac.uk> garth <devnull@localhost>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@debian.eng.cam.ac.uk>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@fedora32-virtual>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@gnw20pc>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@home-laptop>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@localhost.localdomain>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@ubuntu32-virtual>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@ubuntu.eng.cam.ac.uk>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@garth-laptop>
+Garth N. Wells <gnw20@cam.ac.uk> <garth@gnw20pc>
+Garth N. Wells <gnw20@cam.ac.uk> <g.n.wells@tudelft.nl>
+Garth N. Wells <gnw20@cam.ac.uk> gnw20@cam.ac.uk <>
+gideonsimpson <gideonsimpson@dyn-128-59-151-14.dyn.columbia.edu>
+Gustav Magnus Vikström <gustavv@simula.no>
+Gustav Magnus Vikström <gustavv@simula.no> <gustavv@ifi.uio.no>
+Gustav Magnus Vikström <gustavv@simula.no> <gustavv@ifi.uio.no>
+Gustav Magnus Vikström <gustavv@simula.no> <gustavv@utlaan-laptop-1>
+Harish Narayanan <hnarayanan@gmail.com>
+Harish Narayanan <hnarayanan@gmail.com> Harish Narayanan <harish@simula.no>
+Johan Hoffman <jhoffman@csc.kth.se>
+Johan Hoffman <jhoffman@csc.kth.se> hoffman <devnull@localhost>
+Johan Hoffman <jhoffman@csc.kth.se> <jhoffman@na41.nada.kth.se>
+Johan Hoffman <jhoffman@csc.kth.se> <jhoffman@na42.nada.kth.se>
+Ilmar Wilbers <ilmarw@simula.no>
+Ilmar Wilbers <ilmarw@simula.no> <ilmarw@gogmagog.simula.no>
+Ilmar Wilbers <ilmarw@simula.no> <ilmarw@multiboot.local>
+Jack S. Hale <jack.hale@uni.lu>
+Jack S. Hale <jack.hale@uni.lu> <j.hale09@imperial.ac.uk>
+Johan Hake <hake.dev@gmail.com>
+Johan Hake <hake.dev@gmail.com> <johan.hake@gmail.com>
+Johan Hake <hake.dev@gmail.com> <hake@simula.no>
+Johan Jansson <jjan@csc.kth.se>
+Johan Jansson <jjan@csc.kth.se> johan <johan@localhost.localdomain>
+Johan Jansson <jjan@csc.kth.se> johan <johan@nova>
+Johan Jansson <jjan@csc.kth.se> johanjan <devnull@localhost>
+Johan Jansson <jjan@csc.kth.se> johanjan <johanjan@localhost.localdomain>
+Johan Jansson <jjan@csc.kth.se> Johan Jansson <johanjan@math.chalmers.se>
+Johannes Ring <johannr@simula.no>
+Johannes Ring <johannr@simula.no> <johannr@communalis.simula.no>
 Kent-Andre Mardal <kent-and@simula.no>
 Kent-Andre Mardal <kent-and@simula.no> <kent-and@localhost>
+Kristian B. Ølgaard <k.b.oelgaard@gmail.com>
+Kristian B. Ølgaard <k.b.oelgaard@gmail.com> <k.b.oelgaard@tudelft.nl>
+Kristian B. Ølgaard <k.b.oelgaard@gmail.com> <oelgaard@localhost.localdomain>
+Magnus Vikstrøm <gustavv@ifi.uio.no>
+Marco Morandini <marco.morandini@polimi.it>
+Marco Morandini <marco.morandini@polimi.it> <morandini@aero.polimi.it>
+Marie E. Rognes <meg@simula.no>
+Marie E. Rognes <meg@simula.no> <meg@math.uio.no>
+Marie E. Rognes <meg@simula.no> <meg@meg-laptop>
+Marie E. Rognes <meg@simula.no> Marie E. Rognes (meg@simula.no) <Marie E. Rognes (meg@simula.no)>
+Marie E. Rognes <meg@simula.no> meg@simula.no <>
+Martin Sandve Alnæs <martinal@simula.no>
+Martin Sandve Alnæs <martinal@simula.no> <martinal@localhost>
+Martin Sandve Alnæs <martinal@simula.no> <martinal@martinal-desktop>
+Michele Zaffalon <michele.zaffalon@gmail.com>
+Mikael Mortensen <mikaem@math.uio.no>
+Mikael Mortensen <mikaem@math.uio.no> <mikael.mortensen@gmail.com>
+Nate Sime <njcs4@cam.ac.uk>
+Nate Sime <njcs4@cam.ac.uk> <njcs4@galah.bpi.cam.ac.uk>
+Nuno Lopes <ndl@ptmat.fc.ul.pt>
+Nuno Lopes <ndl@ptmat.fc.ul.pt> N.Lopes <devnull@localhost>
+Patrick Farrell <patrick.farrell@maths.ox.ac.uk>
+Patrick Farrell <patrick.farrell@maths.ox.ac.uk> <patrick.farrell06@imperial.ac.uk>
+Patrick Farrell <patrick.farrell@maths.ox.ac.uk> <patrick.farrell@imperial.ac.uk>
+Quang Ha <qth20@cam.ac.uk>
+Kristoffer Selim <selim@simula.no>
+Kristoffer Selim <selim@simula.no> <selim@selim-laptop>
+Simon Funke <simon@simula.no>
+Simon Funke <simon@simula.no> <simon.funke@gmail.com>
+Simon Funke <simon@simula.no> <s.funke09@imperial.ac.uk>
+Solveig Bruvoll <solveio@ifi.uio.no>
+Solveig Masvie <smasvie@gmail.com>
+Steven Vandekerckhove <steven.vandekerckhove@kuleuven-kulak.be>
+Steven Vandekerckhove <steven.vandekerckhove@kuleuven-kulak.be> <Steven.Vandekerckhove@kuleuven-kulak.be>
+stockli <stockli@carleman.nada.kth.se>
+stockli <stockli@carleman.nada.kth.se> <stockli@localhost>
+Tianyi Li <tianyikillua@gmail.com>
+Steffen Müthing <steffen.muething@ipvs.uni-stuttgart.de>
+Steffen Müthing <steffen.muething@ipvs.uni-stuttgart.de> Steffen Müthing steffen.muething@ipvs.uni-stuttgart.de <>
+Miklós Homolya <m.homolya14@imperial.ac.uk>
+Åsmund Ødegård <aasmund@simula.no>
+Åsmund Ødegård <aasmund@simula.no> <aasmundo@manpower.local>
+Ola Skavhaug <skavhaug@simula.no>
+Andre Massing <massing@simula.no>
 Andrew McRae <a.mcrae12@imperial.ac.uk>

-Original file line number
+Diff line change
@@ @@ -1,11 +1,132 @@ @@
 -Martin Sandve Alnæs <[email protected]>
 -Martin Sandve Alnæs <[email protected]> <martinal@localhost>
 -Martin Sandve Alnæs <[email protected]> <martinal@martinal-desktop>
 Anders Logg <[email protected]>
 +Anders Logg <[email protected]> <ffc@bamse>
 +Anders Logg <[email protected]> <logg@yavanna>
 +Anders Logg <[email protected]> <logg@aule>
 +Anders Logg <[email protected]> logg <[email protected]>
 +Anders Logg <[email protected]> fenics <devnull@localhost>
 +Anders Logg <[email protected]> hg <hg@numenor>
 +Anders Logg <[email protected]> root <root@leja>
 Anders Logg <[email protected]> <logg@glaurung>
 Anders Logg <[email protected]> <[email protected]>
 -Kristian B. Ølgaard <[email protected]>
 -Kristian B. Ølgaard <[email protected]> <[email protected]>
 +Anders Logg <[email protected]> <[email protected]>
 +Anders Logg <[email protected]> <logg@olorin>
 +Anders Logg <[email protected]> <[email protected]>
 +Anders Logg <[email protected]> anders <[email protected]>
 +Anders Logg <[email protected]> logg <devnull@localhost>
 +Anders Logg <[email protected]> logg <[email protected]>
 +Anders Logg <[email protected]> logg <[email protected]>
 +Anders Logg <[email protected]> logg <logg@olorin>
 +Andy R. Terrel <[email protected]>
 +Andy R. Terrel <[email protected]> <[email protected]>
 +Andy R. Terrel <[email protected]> aterrel <devnull@localhost>
 +Andy R. Terrel <[email protected]> <[email protected]>
 +Benjamin Kehlet <[email protected]>
 +Benjamin Kehlet <[email protected]> <[email protected]>
 +Benjamin Kehlet <[email protected]> <[email protected]>
 +Benjamin Kehlet <[email protected]> <[email protected]>
 +Benjamin Kehlet <[email protected]> <bkehlet@bkehlet-laptop>
 +Chris Richardson <[email protected]>
 +Chris Richardson <[email protected]> chris <chris@Lenovo-Edge.(none)>
 +Chris Richardson <[email protected]> Chris Richardson <bpi.cam.ac.uk>
 +Chris Richardson <[email protected]> root <[email protected]>
 +Corrado Maurini <[email protected]>
 +Corrado Maurini <[email protected]> <[email protected]>
 +Dag Lindbo <[email protected]>
 +Dag Lindbo <[email protected]> dag <dag@dag-laptop>
 +Dag Lindbo <[email protected]> dag <[email protected]>
 +David Ham <[email protected]>
 +David Ham <[email protected]> [email protected] <>
 +Evan Lezar <[email protected]>
 +Evan Lezar <[email protected]> <[email protected]>
 +Evan Lezar <[email protected]> elezar <elezar@labby>
 +Evan Lezar <[email protected]> elezar <elezar@lefauve>
 +Fredrik Valdmanis <[email protected]>
 +Fredrik Valdmanis <[email protected]> Fredrik Valdmanis <[email protected]>
 +Garth N. Wells <[email protected]>
 +Garth N. Wells <[email protected]> root <[email protected]>
 +Garth N. Wells <[email protected]> garth <devnull@localhost>
 +Garth N. Wells <[email protected]> <[email protected]>
 +Garth N. Wells <[email protected]> <garth@fedora32-virtual>
 +Garth N. Wells <[email protected]> <garth@gnw20pc>
 +Garth N. Wells <[email protected]> <garth@home-laptop>
 +Garth N. Wells <[email protected]> <[email protected]>
 +Garth N. Wells <[email protected]> <garth@ubuntu32-virtual>
 +Garth N. Wells <[email protected]> <[email protected]>
 +Garth N. Wells <[email protected]> <garth@garth-laptop>
 +Garth N. Wells <[email protected]> <garth@gnw20pc>
 +Garth N. Wells <[email protected]> <[email protected]>
 +Garth N. Wells <[email protected]> [email protected] <>
 +gideonsimpson <[email protected]>
 +Gustav Magnus Vikström <[email protected]>
 +Gustav Magnus Vikström <[email protected]> <[email protected]>
 +Gustav Magnus Vikström <[email protected]> <[email protected]>
 +Gustav Magnus Vikström <[email protected]> <gustavv@utlaan-laptop-1>
 +Harish Narayanan <[email protected]>
 +Harish Narayanan <[email protected]> Harish Narayanan <[email protected]>
 +Johan Hoffman <[email protected]>
 +Johan Hoffman <[email protected]> hoffman <devnull@localhost>
 +Johan Hoffman <[email protected]> <[email protected]>
 +Johan Hoffman <[email protected]> <[email protected]>
 +Ilmar Wilbers <[email protected]>
 +Ilmar Wilbers <[email protected]> <[email protected]>
 +Ilmar Wilbers <[email protected]> <[email protected]>
 +Jack S. Hale <[email protected]>
 +Jack S. Hale <[email protected]> <[email protected]>
 +Johan Hake <[email protected]>
 +Johan Hake <[email protected]> <[email protected]>
 +Johan Hake <[email protected]> <[email protected]>
 +Johan Jansson <[email protected]>
 +Johan Jansson <[email protected]> johan <[email protected]>
 +Johan Jansson <[email protected]> johan <johan@nova>
 +Johan Jansson <[email protected]> johanjan <devnull@localhost>
 +Johan Jansson <[email protected]> johanjan <[email protected]>
 +Johan Jansson <[email protected]> Johan Jansson <[email protected]>
 +Johannes Ring <[email protected]>
 +Johannes Ring <[email protected]> <[email protected]>
 Kent-Andre Mardal <[email protected]>
 Kent-Andre Mardal <[email protected]> <kent-and@localhost>
 +Kristian B. Ølgaard <[email protected]>
 +Kristian B. Ølgaard <[email protected]> <[email protected]>
 +Kristian B. Ølgaard <[email protected]> <[email protected]>
 +Magnus Vikstrøm <[email protected]>
 +Marco Morandini <[email protected]>
 +Marco Morandini <[email protected]> <[email protected]>
 +Marie E. Rognes <[email protected]>
 +Marie E. Rognes <[email protected]> <[email protected]>
 +Marie E. Rognes <[email protected]> <meg@meg-laptop>
 +Marie E. Rognes <[email protected]> Marie E. Rognes ([email protected]) <Marie E. Rognes ([email protected])>
 +Marie E. Rognes <[email protected]> [email protected] <>
 +Martin Sandve Alnæs <[email protected]>
 +Martin Sandve Alnæs <[email protected]> <martinal@localhost>
 +Martin Sandve Alnæs <[email protected]> <martinal@martinal-desktop>
 +Michele Zaffalon <[email protected]>
 +Mikael Mortensen <[email protected]>
 +Mikael Mortensen <[email protected]> <[email protected]>
 +Nate Sime <[email protected]>
 +Nate Sime <[email protected]> <[email protected]>
 +Nuno Lopes <[email protected]>
 +Nuno Lopes <[email protected]> N.Lopes <devnull@localhost>
 +Patrick Farrell <[email protected]>
 +Patrick Farrell <[email protected]> <[email protected]>
 +Patrick Farrell <[email protected]> <[email protected]>
 +Quang Ha <[email protected]>
 +Kristoffer Selim <[email protected]>
 +Kristoffer Selim <[email protected]> <selim@selim-laptop>
 +Simon Funke <[email protected]>
 +Simon Funke <[email protected]> <[email protected]>
 +Simon Funke <[email protected]> <[email protected]>
 +Solveig Bruvoll <[email protected]>
 +Solveig Masvie <[email protected]>
 +Steven Vandekerckhove <[email protected]>
 +Steven Vandekerckhove <[email protected]> <[email protected]>
 +stockli <[email protected]>
 +stockli <[email protected]> <stockli@localhost>
 +Tianyi Li <[email protected]>
 +Steffen Müthing <[email protected]>
 +Steffen Müthing <[email protected]> Steffen Müthing [email protected] <>
 +Miklós Homolya <[email protected]>
 +Åsmund Ødegård <[email protected]>
 +Åsmund Ødegård <[email protected]> <[email protected]>
 +Ola Skavhaug <[email protected]>
 +Andre Massing <[email protected]>
 Andrew McRae <[email protected]>