From f4369d76c8f46c27329fc81a6e505d2612f00f88 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Mon, 9 Jul 2012 16:55:09 +0200
Subject: [PATCH] Add a .mailmap file, and clean up AUTHORS somewhat

* A mailmap makes it easier to keep track of contributors.
* Changes to the AUTHORS file:
  - fix misspellings
  - add missing/incomplete names
  - remove duplicate mentions
* No names were added to or removed from the AUTHORS list.
---
 .mailmap | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 AUTHORS  |  26 ++++++--------
 2 files changed, 115 insertions(+), 15 deletions(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..33d125d20d6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,104 @@
+Aaron Heckmann <aaron.heckmann@gmail.com> <aaron.heckmann+github@gmail.com>
+Abe Fettig <abefettig@gmail.com> <abe@fettig.net>
+Alex Kocharin <rlidwka@kocharin.ru>
+Alex Kocharin <rlidwka@kocharin.ru> <alex@kocharin.ru>
+Alexis Sellier <self@cloudhead.net>
+Alexis Sellier <self@cloudhead.net> <alexis@cloudhead.io>
+Arlo Breault <arlolra@gmail.com>
+Artem Zaytsev <a.arepo@gmail.com>
+Atsuo Fukaya <fukayatsu@gmail.com>
+Ben Noordhuis <info@bnoordhuis.nl> <bnoordhuis@bender.(none)>
+Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
+Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
+Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
+Brian White <mscdex@mscdex.net>
+Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
+Chew Choon Keat <choonkeat@gmail.com>
+Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
+Daniel Berger <code+node@dpbis.net>
+Daniel Chcouri <333222@gmail.com>
+Daniel Gröber <darklord@darkboxed.org>
+Daniel Gröber <darklord@darkboxed.org> <dxld@darkboxed.org>
+Daniel Pihlström <sciolist.se@gmail.com>
+David Siegel <david@artcom.de> <david.siegel@artcom.de>
+Domenic Denicola <domenic@domenicdenicola.com>
+Eduard Burtescu <eddy_me08@yahoo.com>
+Einar Otto Stangvik <einaros@gmail.com>
+Elliott Cable <me@ell.io>
+EungJun Yi <semtlenori@gmail.com>
+Evan Larkin <evan.larkin.il.com> <evan.larkin.iit@gmail.com>
+Farid Neshat <FaridN_SOAD@yahoo.com>
+Felix Geisendörfer <felix@debuggable.com>
+Felix Geisendörfer <felix@debuggable.com>
+Friedemann Altrock <frodenius@gmail.com>
+Fuji Goro <gfuji@cpan.org>
+Gabriel de Perthuis <g2p.code@gmail.com>
+Herbert Vojčík <herby@mailbox.sk>
+Igor Zinkovsky <igorzi@microsoft.com>
+Isaac Z. Schlueter <i@izs.me>
+Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
+Jérémy Lal <kapouer@melix.org>
+Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
+Jered Schmidt <tr@nslator.jp>
+Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
+Johan Bergström <bugs@bergstroem.nu>
+Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
+Jonas Pfenniger <jonas@pfenniger.name> <jonas@stvs.ch>
+Jonathan Rentzsch <jwr.git@redshed.net>
+Joshua S. Weinstein <josher19@users.sf.net>
+Koichi Kobayashi <koichik@improvement.jp>
+Kris Kowal <kris.kowal@cixar.com>
+Kyle Robinson Young <kyle@dontkry.com>
+Mathias Pettersson <mape@mape.me>
+Michael Bernstein <michaelrbernstein@gmail.com>
+Michael Wilber <gcr@sneakygcr.net>
+Micheil Smith <micheil@brandedcode.com> <micheil@yettobebranded.net>
+Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
+Nebu Pookins<nebu@nebupookins.net>
+Nicholas Kinsey <pyrotechnick@feistystudios.com>
+Onne Gorter <onne@onnlucky.com>
+Paul Querna <pquerna@apache.org> <paul@querna.org>
+Ray Morgan <rmorgan@zappos.com>
+Ray Solomon <raybsolomon@gmail.com>
+Rick Olson <technoweenie@gmail.com>
+Ryan Dahl <ry@tinyclouds.org>
+Ryan Emery <seebees@gmail.com>
+Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
+Sam Shull <brickysam26@gmail.com> <sshull@squaremouth.com>
+Sambasiva Suda <sambasivarao@gmail.com>
+San-Tai Hsu <v@fatpipi.com>
+Sergey Kryzhanovsky <skryzhanovsky@gmail.com> <another@dhcp199-223-red.yandex.net>
+Shannen Saez <shannenlaptop@gmail.com>
+Shigeki Ohtsu <ohtsu@d.jp> <ohtsu@iij.ad.jp>
+Siddharth Mahendraker <siddharth_mahen@hotmail.com> <siddharth_mahen@me.com>
+Simon Willison <simon@simonwillison.net>
+Stanislav Opichal <opichals@gmail.com>
+Stefan Bühler <stbuehler@web.de>
+Tadashi SAWADA <cesare@mayverse.jp>
+Takahiro ANDO <takahiro.ando@gmail.com>
+Ted Young <ted@radicaldesigns.org>
+Thomas Lee <thomas.lee@shinetech.com> <tom@tom-debian.sensis.com.au>
+Tim Caswell <tim@creationix.com> <tim@0-26-8-e9-4c-e1.dyn.utdallas.edu>
+Tim Smart <timehandgod@gmail.com> <tim@fostle.com>
+Tim Smart <timehandgod@gmail.com> <timehandgod@gmail.com>
+TJ Holowaychuk <tj@vision-media.ca>
+TJ Holowaychuk <tj@vision-media.ca> <tjholowayhuk@gmail.com>
+Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
+Tyler Larson <talltyler@gmail.com>
+Vincent Voyer <v@fasterize.com>
+Yoshihiro KIKUCHI <yknetg@gmail.com>
+Yuichiro MASUI <masui@masuidrive.jp>
+Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
+Zoran Tomicic <ztomicic@gmail.com>
+
+# These people didn't contribute patches to node directly,
+# but we've landed their v8 patches in the node repository:
+Daniel Clifford <danno@chromium.org>
+Erik Corry <erik.corry@gmail.com>
+Jakob Kummerow <jkummerow@chromium.org>
+Kevin Millikin <kmillikin@chromium.org>
+Lasse R.H. Nielsen <lrn@chromium.org>
+Michael Starzinger <mstarzinger@chromium.org>
+Toon Verwaest <verwaest@chromium.org>
+Vyacheslav Egorov <vegorov@chromium.org>
+Yang Guo <yangguo@chromium.org>
diff --git a/AUTHORS b/AUTHORS
index a389d07ce48..7158aed8cb2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -59,7 +59,7 @@ Arlo Breault <arlolra@gmail.com>
 Kris Kowal <kris.kowal@cixar.com>
 Jacek Becela <jacek.becela@gmail.com>
 Rob Ellis <kazoomer@gmail.com>
-Tim Smart <timehAndGod@gmail.com>
+Tim Smart <timehandgod@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
 Krishna Rajendran <krishna@emptybox.org>
 Nicholas Kinsey <pyrotechnick@feistystudios.com>
@@ -98,8 +98,7 @@ Jerome Etienne <jerome.etienne@gmail.com>
 Dmitriy Shalashov <skaurus@gmail.com>
 Adam Wiggins <adam@heroku.com>
 Rick Olson <technoweenie@gmail.com>
-David Siegel <david.siegel@artcom.de>
-Sergey Kzyzhanovsky <skryzhanovsky@gmail.com>
+Sergey Kryzhanovsky <skryzhanovsky@gmail.com>
 Marco Rogers <marco.rogers@gmail.com>
 Benjamin Fritsch <beanie@benle.de>
 Jan Kassens <jan@kassens.net>
@@ -144,13 +143,13 @@ Daniel Gröber <darklord@darkboxed.org>
 Travis Swicegood <development@domain51.com>
 Oleg Slobodskoi <oleg008@gmail.com>
 Jeremy Martin <jmar777@gmail.com>
-Michael W <gcr@sneakygcr.net>
+Michael Wilber <gcr@sneakygcr.net>
 Sean Braithwaite <brapse@gmail.com>
 Anders Conbere <aconbere@gmail.com>
 Devin Torres <devin@devintorres.com>
 Theo Schlossnagle <jesus@omniti.com>
 Kai Chen <kaichenxyz@gmail.com>
-Daniel C <333222@gmail.com>
+Daniel Chcouri <333222@gmail.com>
 Mihai Călin Bazon <mihai@bazon.net>
 Ali Farhadi <a.farhadi@gmail.com>
 Daniel Ennis <aikar@aikar.co>
@@ -159,7 +158,6 @@ Greg Hughes <greg@ghughes.com>
 David Trejo <david.daniel.trejo@gmail.com>
 Joe Walnes <joe@walnes.com>
 Koichi Kobayashi <koichik@improvement.jp>
-Daniel Gröber <dxld@darkboxed.org>
 Konstantin Käfer <github@kkaefer.com>
 Richard Rodger <richard@ricebridge.com>
 Andreas Reich <andreas@reich.name>
@@ -192,14 +190,14 @@ Wojciech Wnętrzak <w.wnetrzak@gmail.com>
 Reid Burke <me@reidburke.com>
 Niklas Fiekas <niklas.fiekas@googlemail.com>
 Adam Luikart <me@adamluikart.com>
-avz <a.arepo@gmail.com>
+Artem Zaytsev <a.arepo@gmail.com>
 Jeremy Selier <jeremy@jolicloud.com>
 Igor Zinkovsky <igorzi@microsoft.com>
 Shigeki Ohtsu <ohtsu@d.jp>
-vegorov@chromium.org <vegorov@chromium.org>
+Vyacheslav Egorov <vegorov@chromium.org>
 Pierre-Alexandre St-Jean <pierrealexandre.stjean@gmail.com>
 Vicente Jimenez Aguilar <googuy@gmail.com>
-SAWADA Tadashi <cesare@mayverse.jp>
+Tadashi SAWADA <cesare@mayverse.jp>
 Logan Smyth <loganfsmyth@gmail.com>
 Christopher Wright <christopherwright@gmail.com>
 Mickaël Delahaye <mickael.delahaye@gmail.com>
@@ -211,7 +209,7 @@ Antranig Basman <antranig.basman@colorado.edu>
 Maciej Małecki <maciej.malecki@notimplemented.org>
 Evan Martin <martine@danga.com>
 Peter Lyons <pete@peterlyons.com>
-jkummerow@chromium.org <jkummerow@chromium.org>
+Jakob Kummerow <jkummerow@chromium.org>
 Jann Horn <jannhorn@googlemail.com>
 Abimanyu Raja <abimanyuraja@gmail.com>
 Karl Skomski <karl@skomski.com>
@@ -229,7 +227,6 @@ Simen Brekken <simen.brekken@gmail.com>
 Guglielmo Ferri <44gatti@gmail.com>
 Thomas Parslow <tom@almostobsolete.net>
 Ryan Emery <seebees@gmail.com>
-Zachary Scott <zachary@zacharyscott.net>
 Jordan Sissel <jls@semicomplete.com>
 Matt Robenolt <matt@ydekproductions.com>
 Jacob H.C. Kragh <jhckragh@gmail.com>
@@ -298,14 +295,13 @@ Yosef Dinerstein <yosefd@microsoft.com>
 Nathan Friedly <nathan@nfriedly.com>
 Aaron Jacobs <jacobsa@google.com>
 Mustansir Golawala <mgolawala@gmail.com>
-fukayatsu <fukayatsu@gmail.com>
+Atsuo Fukaya <fukayatsu@gmail.com>
 Domenic Denicola <domenic@domenicdenicola.com>
 Bryan Cantrill <bryan@joyent.com>
-lrn@chromium.org <lrn@chromium.org>
+Lasse R.H. Nielsen <lrn@chromium.org>
 Dane Springmeyer <dane@dbsgeo.com>
-Sambasiva Suda <sambasivarao@gmail.com>
 Vincent Voyer <v@fasterize.com>
-ANDO Takahiro <takahiro.ando@gmail.com>
+Takahiro ANDO <takahiro.ando@gmail.com>
 Brian Schroeder <bts@gmail.com>
 J. Lee Coltrane <lee@projectmastermind.com>
 Javier Hernández <jhernandez@emergya.com>