Revert "Revert "Add a .mailmap file.""

danmar · danmar · commit 5641833cdb73 · 2013-10-04T18:03:18.000+02:00
This reverts commit 4968330.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,49 @@
+Andreas Bie&szlig;mann <andreas@biessmann.de> <andreas.biessmann@corscience.de>
+Andrew Martin <andrew.c.martin@saic.com> acm4me
+Ankita Gupta <ankigupta@paypal.com> Ankita-gupta
+Benjamin Goose <gans+github@tngtech.com> <gansb+github@tngtech.com>
+Daniel Marjam&auml;ki <daniel.marjamaki@gmail.com> <hyd_danmar@users.sourceforge.net>
+Daniel Marjam&auml;ki <daniel.marjamaki@gmail.com> <danielm77@spray.se>
+Daniel Marjam&auml;ki <daniel.marjamaki@gmail.com> Daniel Marjam&#65533;ki
+Daniel Marjam&auml;ki <daniel.marjamaki@gmail.com> <daniel@daniel-laptop.(none)>
+Daniel Marjam&auml;ki <daniel.marjamaki@gmail.com> <daniel@raspberrypi.(none)>
+Deepak Gupta <deepak.dce01@gmail.com> deepak gupta
+Ettl Martin <ettl.martin78@googlemail.com> Martin Ettl
+Ettl Martin <ettl.martin78@googlemail.com> <ettl.martin@gmx.de>
+Ettl Martin <ettl.martin78@googlemail.com> Martin Ettl <martin@martin.(none)>
+Frank Zingsheim <f.zingsheim@gmx.de> <zingsheim@users.sourceforge.net>
+Gianluca Scacco <gscacco@users.sourceforge.net> <gianluca@gianluca-laptop.(none)>
+Gianluca Scacco <gscacco@users.sourceforge.net> <giangy@giangy-desktop.(none)>
+Henrik Nilsson <henrik.nilsson@tvaaker.se> <henrik.nilsson@proceranetworks.com>
+Kimmo Varis <kimmov@gmail.com> Kimmo varis
+Kimmo Varis <kimmov@gmail.com> <kimmov@users.sourceforge.net>
+Kimmo Varis <kimmov@gmail.com> <ext-kimmo.1.varis@nokia.com>
+Kimmo Varis <kimmov@gmail.com> <kimmo@kimmoDesktop.(none)>
+Kimmo Varis <kimmov@gmail.com> <kimmo@kimmo-VirtualBox.(none)>
+Kimmo Varis <kimmov@gmail.com> <kimmo@kimmo-laptop.(none)>
+Kimmo Varis <kimmov@gmail.com> <kimmov@kimmolaptop.(none)>
+Leandro Penz <lpenz@users.sourceforge.net> Leandro Lisboa Penz <llpenz@gmail.com>
+Leandro Penz <lpenz@users.sourceforge.net> Leandro Lisboa Penz <lpenz@notebook.penz>
+makulik <g-makulik@t-online.de> unknown <g-makulik@t-online.de>
+Nicolas Le Cam <kush@users.sourceforge.net> <niko.lecam@gmail.com>
+Pete Johns <paj-github@johnsy.com> <pete@johnsy.com>
+PKEuS <philipp.kloke@web.de> Philipp K
+PKEuS <philipp.kloke@web.de> Philipp Kloke
+PKEuS <philipp.kloke@web.de> <philipp@kloke-witten.dyndns.org>
+Reijo Tomperi <aggro80@users.sourceforge.net> <dvice_null@yahoo.com>
+Robert Reif <reif@earthlink.net> <reif@eartlink.net>
+Ryan Pavlik <rpavlik@iastate.edu> <ryan.pavlik@snc.edu>
+
+S&eacute;bastien Debrard <sebastien.debrard@gmail.com> seb777
+S&eacute;bastien Debrard <sebastien.debrard@gmail.com> S&#65533;bastien Debrard
+S&eacute;bastien Debrard <sebastien.debrard@gmail.com> Debrard S&eacute;bastien
+
+Stefan Weil <weil@mail.berlios.de> <sw@weilnetz.de>
+Tim Gerundt <tim@gerundt.de> <gerundt@users.sourceforge.net>
+Vesa Pikki <spyree@gmail.com> <spyree@users.sourceforge.net>
+XhmikosR <xhmikosr@users.sourceforge.net> <xhmikosr@yahoo.com>
+Zachary Blair <zack_blair@hotmail.com> <ack_blair@outlook.com>
+Zachary Blair <zack_blair@hotmail.com> <zack_blair@outlook.com>
+Zachary Blair <zack_blair@hotmail.com> zblair
+
+

-Original file line number
+Diff line change
@@ @@ -0,0 +1,49 @@ @@
 +Andreas Bießmann <[email protected]> <[email protected]>
 +Andrew Martin <[email protected]> acm4me
 +Ankita Gupta <[email protected]> Ankita-gupta
 +Benjamin Goose <[email protected]> <[email protected]>
 +Daniel Marjamäki <[email protected]> <[email protected]>
 +Daniel Marjamäki <[email protected]> <[email protected]>
 +Daniel Marjamäki <[email protected]> Daniel Marjam�ki
 +Daniel Marjamäki <[email protected]> <daniel@daniel-laptop.(none)>
 +Daniel Marjamäki <[email protected]> <daniel@raspberrypi.(none)>
 +Deepak Gupta <[email protected]> deepak gupta
 +Ettl Martin <[email protected]> Martin Ettl
 +Ettl Martin <[email protected]> <[email protected]>
 +Ettl Martin <[email protected]> Martin Ettl <martin@martin.(none)>
 +Frank Zingsheim <[email protected]> <[email protected]>
 +Gianluca Scacco <[email protected]> <gianluca@gianluca-laptop.(none)>
 +Gianluca Scacco <[email protected]> <giangy@giangy-desktop.(none)>
 +Henrik Nilsson <[email protected]> <[email protected]>
 +Kimmo Varis <[email protected]> Kimmo varis
 +Kimmo Varis <[email protected]> <[email protected]>
 +Kimmo Varis <[email protected]> <[email protected]>
 +Kimmo Varis <[email protected]> <kimmo@kimmoDesktop.(none)>
 +Kimmo Varis <[email protected]> <kimmo@kimmo-VirtualBox.(none)>
 +Kimmo Varis <[email protected]> <kimmo@kimmo-laptop.(none)>
 +Kimmo Varis <[email protected]> <kimmov@kimmolaptop.(none)>
 +Leandro Penz <[email protected]> Leandro Lisboa Penz <[email protected]>
 +Leandro Penz <[email protected]> Leandro Lisboa Penz <[email protected]>
 +makulik <[email protected]> unknown <[email protected]>
 +Nicolas Le Cam <[email protected]> <[email protected]>
 +Pete Johns <[email protected]> <[email protected]>
 +PKEuS <[email protected]> Philipp K
 +PKEuS <[email protected]> Philipp Kloke
 +PKEuS <[email protected]> <[email protected]>
 +Reijo Tomperi <[email protected]> <[email protected]>
 +Robert Reif <[email protected]> <[email protected]>
 +Ryan Pavlik <[email protected]> <[email protected]>
++
 +Sébastien Debrard <[email protected]> seb777
 +Sébastien Debrard <[email protected]> S�bastien Debrard
 +Sébastien Debrard <[email protected]> Debrard Sébastien
++
 +Stefan Weil <[email protected]> <[email protected]>
 +Tim Gerundt <[email protected]> <[email protected]>
 +Vesa Pikki <[email protected]> <[email protected]>
 +XhmikosR <[email protected]> <[email protected]>
 +Zachary Blair <[email protected]> <[email protected]>
 +Zachary Blair <[email protected]> <[email protected]>
 +Zachary Blair <[email protected]> zblair
++
++