From 418ef78c5c1eeacdd955bdd118e0e72191ae7f92 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 28 Oct 2015 13:23:08 -0700
Subject: [PATCH] Update mailmap

---
 .mailmap    | 7 ++++++-
 AUTHORS.txt | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0f06604fa53..233e55e83d0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,7 @@ Aaron Todd <github@opprobrio.us>
 Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com>
 Ahmed Charles <ahmedcharles@gmail.com> <acharles@outlook.com>
 Aydin Kim <ladinjin@hanmail.net> aydin.kim <aydin.kim@samsung.com>
+Alex Burka <durka42+github@gmail.com> Alex Burka <aburka@seas.upenn.edu>
 Alex Lyon <arcterus@mail.com> <Arcterus@mail.com>
 Alex Newman <posix4e@gmail.com> Alex HotShot Newman <posix4e@gmail.com>
 Alex Rønne Petersen <alex@lycus.org>
@@ -32,6 +33,7 @@ Carol Willing <carolcode@willingconsulting.com>
 Chris Pressey <cpressey@gmail.com>
 Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
 Corey Farwell <coreyf+rust@rwell.org> Corey Farwell <coreyf@rwell.org>
+Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net>
 David Klein <david.klein@baesystemsdetica.com>
 David Manescu <david.manescu@gmail.com> <dman2626@uni.sydney.edu.au>
 Damien Schoof <damien.schoof@gmail.com>
@@ -51,7 +53,7 @@ Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org>
 Evgeny Sologubov
 Falco Hirschenberger <falco.hirschenberger@gmail.com> <hirschen@itwm.fhg.de>
 Felix S. Klock II <pnkfelix@pnkfx.org> Felix S Klock II <pnkfelix@pnkfx.org>
-Gareth Daniel Smith <garethdanielsmith@gmail.com>
+Gareth Daniel Smith <garethdanielsmith@gmail.com> gareth <gareth@gareth-N56VM.(none)>
 Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
 Graham Fawcett <fawcett@uwindsor.ca> <graham.fawcett@gmail.com>
 Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
@@ -99,6 +101,7 @@ Matthew McPherrin <matthew@mcpherrin.ca> <matt@mcpherrin.ca>
 Matthijs Hofstra <thiezz@gmail.com>
 Michael Williams <m.t.williams@live.com>
 Michael Woerister <michaelwoerister@gmail> <michaelwoerister@gmail.com> <michaelwoerister@posteo> Michael Woerister <michaelwoerister@posteo>
+Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com>
 Neil Pankey <npankey@gmail.com> <neil@wire.im>
 Nicholas Mazzuca <npmazzuca@gmail.com> Nicholas <npmazzuca@gmail.com>
 Oliver Schneider <github6541940@oli-obk.de> <git1984941651981@oli-obk.de> <git1984941651981@oli-obk.de> Oliver 'ker' Schneider <rust19446194516@oli-obk.de>
@@ -125,10 +128,12 @@ startling <tdixon51793@gmail.com>
 Steven Fackler <sfackler@gmail.com> <sfackler@palantir.com>
 Steven Stewart-Gallus <sstewartgallus00@langara.bc.ca> <sstewartgallus00@mylangara.bc.ca>
 Tamir Duberstein <tamird@gmail.com> Tamir Duberstein <tamird@squareup.com>
+Thiago Pontes <email@thiago.me> thiagopnts <thiagopnts@gmail.com>
 Ticki <Ticki@users.noreply.github.com> Ticki <@>
 Tim Chevalier <chevalier@alum.wellesley.edu> <catamorphism@gmail.com>
 Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
 Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost>
+Ulrik Sverdrup <bluss@users.noreply.github.com> bluss <bluss@users.noreply.github.com> bluss <bluss>
 Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com>
 William Ting <io@williamting.com> <william.h.ting@gmail.com>
 Xuefeng Wu <benewu@gmail.com> Xuefeng Wu <xfwu@thoughtworks.com> XuefengWu <benewu@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 310a91b2d16..1e3707e2635 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -143,8 +143,6 @@ Birunthan Mohanathas <birunthan@mohanathas.com>
 Björn Steinbrink <bsteinbr@gmail.com>
 blake2-ppc <ulrik.sverdrup@gmail.com>
 Blake Loring <Blake.Loring@ig.com>
-bluss <bluss>
-bluss <bluss@users.noreply.github.com>
 Boris Egorov <egorov@linux.com>
 bors <bors@rust-lang.org>
 Bouke van der Bijl <boukevanderbijl@gmail.com>
@@ -1078,7 +1076,6 @@ Thad Guidry <thadguidry@gmail.com>
 Theo Belaire <theo.belaire@gmail.com>
 theptrk <patrick.tran06@gmail.com>
 Thiago Carvalho <thiago.carvalho@westwing.de>
-thiagopnts <thiagopnts@gmail.com>
 Thiago Pontes <email@thiago.me>
 Thomas Backman <serenity@exscape.org>
 Thomas Bracht Laumann Jespersen <laumann.thomas@gmail.com>