From 1e3cb301aa3b4ea07e20c2a04698332ea194a538 Mon Sep 17 00:00:00 2001
From: Kenan Yildirim <kenan@kenany.me>
Date: Fri, 13 Mar 2015 08:02:56 -0400
Subject: [PATCH] doc: add a few .mailmap entries

---
 .mailmap | 5 +++++
 AUTHORS  | 8 +++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index 5b346e1678801..1f5332c47092f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,6 @@
 Arlo Breault <arlolra@gmail.com>
 Alex K. Wolfe <alexkwolfe@gmail.com>
+Andrew Bradley <cspotcode@gmail.com>
 Andrew Lunny <alunny@gmail.com>
 Benjamin Coe <bencoe@gmail.com>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
@@ -20,6 +21,7 @@ Isaac Z. Schlueter <i@izs.me> isaacs <i@izs.me>
 Jake Verbaten <raynos2@gmail.com>
 James Sanders <jimmyjazz14@gmail.com>
 Jason Smith <jhs@iriscouch.com>
+Jonas Weber <github@jonasw.de>
 Kris Windham <kriswindham@gmail.com>
 Lin Clark <lin.w.clark@gmail.com>
 Maciej Małecki <me@mmalecki.com> <maciej.malecki@notimplemented.org>
@@ -28,6 +30,9 @@ Maxim Bogushevich <boga1@mail.ru>
 Max Goodman <c@chromakode.com>
 Nicolas Morel <marsup@gmail.com>
 Olivier Melcher <olivier.melcher@gmail.com>
+Ryan Emery <seebees@gmail.com>
+Sam Mikes <smikes@cubane.com>
+Tony <zearin@gonk.net>
 Visnu Pitiyanuvath <visnupx@gmail.com>
 Will Elwood <w.elwood08@gmail.com>
 Zeke Sikelianos <zeke@sikelianos.com>
diff --git a/AUTHORS b/AUTHORS
index 2c8acf7884e32..cf634ba68b679 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,7 +34,6 @@ Federico Romero <federomero@gmail.com>
 Visnu Pitiyanuvath <visnupx@gmail.com>
 Irakli Gozalishvili <rfobic@gmail.com>
 Mark Cahill <mark@tiemonster.info>
-Zearin <zearin@gonk.net>
 Tony <zearin@gonk.net>
 Iain Sproat <iainsproat@gmail.com>
 Trent Mick <trentm@gmail.com>
@@ -46,7 +45,7 @@ Dean Landolt <dean@deanlandolt.com>
 Oleg Efimov <efimovov@gmail.com>
 Martin Cooper <mfncooper@gmail.com>
 Jann Horn <jannhorn@googlemail.com>
-cspotcode <cspotcode@gmail.com>
+Andrew Bradley <cspotcode@gmail.com>
 Maciej Małecki <me@mmalecki.com>
 Stephen Sugden <glurgle@gmail.com>
 Michael Budde <mbudde@gmail.com>
@@ -91,7 +90,7 @@ Jed Schmidt <tr@nslator.jp>
 Ian Livingstone <ianl@cs.dal.ca>
 Patrick Pfeiffer <patrick@buzzle.at>
 Paul Miller <paul@paulmillr.com>
-seebees <seebees@gmail.com>
+Ryan Emery <seebees@gmail.com>
 Carl Lange <carl@flax.ie>
 Jan Lehnardt <jan@apache.org>
 Stuart P. Bentley <stuart@testtrack4.com>
@@ -220,7 +219,6 @@ Faiq Raza <faiqrazarizvi@gmail.com>
 Thomas Torp <thomas@erupt.no>
 Sam Mikes <smikes@cubane.com>
 Mat Tyndall <mat.tyndall@gmail.com>
-smikes <smikes@cubane.com>
 Tauren Mills <tauren@sportzing.com>
 Ron Martinez <ramartin.net@gmail.com>
 Kazuhito Hokamura <k.hokamura@gmail.com>
@@ -256,7 +254,7 @@ Helge Skogly Holm <helge.holm@gmail.com>
 Peter A. Shevtsov <petr.shevtsov@gmail.com>
 Alain Kalker <a.c.kalker@gmail.com>
 Bryant Williams <b.n.williams@gmail.com>
-thriqon <github@jonasw.de>
+Jonas Weber <github@jonasw.de>
 Tim Whidden <twhid@twhid.com>
 Andreas <functino@users.noreply.github.com>
 Karolis Narkevicius <karolis.n@gmail.com>