From 7f23a83c429562b7cd477930706cdbf22c86c21c Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Sun, 23 Aug 2015 17:45:43 +1000
Subject: [PATCH] doc: update AUTHORS list

Update AUTHORS list using tools/update-authors.sh
Fix @muddletoes' .mailmap entry

PR-URL: https://github.com/nodejs/node/pull/2505
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 .mailmap | 3 ++-
 AUTHORS  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index e92c1dd7066d33..0906e65c39f29f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -77,7 +77,7 @@ Maciej Małecki <maciej.malecki@notimplemented.org> <me@mmalecki.com>
 Malte-Thorben Bruns <skenqbx@gmail.com>
 Malte-Thorben Bruns <skenqbx@googlemail.com>
 Mathias Pettersson <mape@mape.me>
-Matthew Lyes <muddletoes@hotmail.com>
+Matthew Lye <muddletoes@hotmail.com>
 Michael Bernstein <michaelrbernstein@gmail.com>
 Michael Wilber <gcr@sneakygcr.net>
 Micheil Smith <micheil@brandedcode.com> <micheil@yettobebranded.net>
@@ -114,6 +114,7 @@ Simon Willison <simon@simonwillison.net>
 Stanislav Opichal <opichals@gmail.com>
 Stefan Bühler <stbuehler@web.de>
 Steven R. Loomis <srl@icu-project.org> <srloomis@us.ibm.com>
+Todd Kennedy <todd@selfassembled.org> <toddself@users.noreply.github.com>
 TJ Holowaychuk <tj@vision-media.ca>
 TJ Holowaychuk <tj@vision-media.ca> <tjholowayhuk@gmail.com>
 Tadashi SAWADA <cesare@mayverse.jp>
diff --git a/AUTHORS b/AUTHORS
index c9a855b178dd0d..cfcf86132de0ea 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -689,7 +689,7 @@ Roman Reiss <me@silverwind.io>
 Glen Keane <glenkeane.94@gmail.com>
 Xiaowei Li <446240525@qq.com>
 toastynerd <tylermorgan86@gmail.com>
-Todd Kennedy <toddself@users.noreply.github.com>
+Todd Kennedy <todd@selfassembled.org>
 Icer Liang <wizicer@users.noreply.github.com>
 Stephen Belanger <admin@stephenbelanger.com>
 Jeremiah Senkpiel <fishrock123@rocketmail.com>
@@ -781,8 +781,10 @@ Gireesh Punathil <gpunathi@in.ibm.com>
 Lucien Greathouse <me@lpghatguy.com>
 Chad Johnston <cjohnston@megatome.com>
 Sam Stites <sam@stites.io>
-Matthew Lyes <muddletoes@hotmail.com>
+Matthew Lye <muddletoes@hotmail.com>
 Matt Loring <mattloring@google.com>
 P.S.V.R <pmq2001@gmail.com>
+Jacob Edelman <edelman.jd@gmail.com>
+Mike Atkins <mike.atkins@lanetix.com>
 
 # Generated by tools/update-authors.sh