From 48facf93ad26c85c73d714e52b958667c5f506d9 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Wed, 8 Apr 2015 21:35:06 +1000
Subject: [PATCH] doc: update AUTHORS list

Update AUTHORS list using tools/update-authors.sh

PR-URL: https://github.com/iojs/io.js/pull/1372
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
 .mailmap |  2 ++
 AUTHORS  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 9466df3..e459671 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Alexey Kupershtokh <alexey.kupershtokh@gmail.com> <wicked@alawar.com>
 Alexis Campailla <alexis@janeasystems.com> <orangemocha@github.com>
 Alexis Sellier <self@cloudhead.net>
 Alexis Sellier <self@cloudhead.net> <alexis@cloudhead.io>
+Aria Stewart <aredridel@dinhe.net> <aredridel@nbtsc.org>
 Arlo Breault <arlolra@gmail.com>
 Artem Zaytsev <a.arepo@gmail.com>
 Arnout Kazemier <info@3rd-Eden.com> <3rd-Eden@users.noreply.github.com>
@@ -66,6 +67,7 @@ Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
 Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp>
 Kazuyuki Yamada <tasogare.pg@gmail.com>
 Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
+Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
 Koichi Kobayashi <koichik@improvement.jp>
 Kris Kowal <kris.kowal@cixar.com>
 Kyle Robinson Young <kyle@dontkry.com>
diff --git a/AUTHORS b/AUTHORS
index 7ddbf8e..a462207 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -111,7 +111,7 @@ Bert Belder <bertbelder@gmail.com>
 Trent Mick <trentm@gmail.com>
 Fedor Indutny <fedor@indutny.com>
 Illarionov Oleg <oleg@emby.ru>
-Aria Stewart <aredridel@nbtsc.org>
+Aria Stewart <aredridel@dinhe.net>
 Johan Euphrosine <proppy@aminche.com>
 Russell Haering <russellhaering@gmail.com>
 Bradley Meck <bradley.meck@gmail.com>
@@ -735,5 +735,14 @@ Alex Yursha <alexyursha@gmail.com>
 Steven Vercruysse <stcruy@users.noreply.github.com>
 Aleksanteri Negru-Vode <aleksanteri.negru-vode@aalto.fi>
 Mathieu Darse <mattdarse@gmail.com>
+Connor Peet <connor@peet.io>
+Mayhem <stepien.nicolas@gmail.com>
+Olov Lassus <olov.lassus@gmail.com>
+Phillip Lamplugh <phillip.lamplugh@gmail.com>
+Kohei TAKATA <kt.koheitakata@gmail.com>
+Giovanny Andres Gongora Granada <gioyik@gmail.com>
+Jeffrey Jagoda <jeffrey.jagoda@gmail.com>
+Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
+Peter Petrov <onestone@gmail.com>
 
 # Generated by tools/update-authors.sh
-- 
2.7.4