From 89454237d87572f47a7cfa2455e245cbd0c6ecd6 Mon Sep 17 00:00:00 2001
From: John Dickinson <me@not.mn>
Date: Mon, 19 Mar 2012 12:35:53 -0500
Subject: [PATCH] updated authors file and added .mailmap

Change-Id: Idf0d1bbc5c9df025825190035871294692e7e6a4
---
 .mailmap | 27 +++++++++++++++++++++++++++
 AUTHORS  | 11 +++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..7de8daa89d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,27 @@
+Greg Holt <gholt@rackspace.com> gholt <gholt@brim.net>
+Greg Holt <gholt@rackspace.com> gholt <devnull@brim.net>
+Greg Holt <gholt@rackspace.com> gholt <z-github@brim.net>
+Greg Holt <gholt@rackspace.com>
+John Dickinson <me@not.mn> <john.dickinson@rackspace.com>
+Michael Barton <mike@weirdlooking.com> <michael.barton@rackspace.com>
+Michael Barton <mike@weirdlooking.com> <mike-launchpad@weirdlooking.com>
+Michael Barton <mike@weirdlooking.com> Mike Barton
+Clay Gerrard <clay.gerrard@gmail.com> <clayg@clayg-desktop>
+Clay Gerrard <clay.gerrard@gmail.com> <clay.gerrard@rackspace.com>
+Clay Gerrard <clay.gerrard@gmail.com> clayg <clay.gerrard@gmail.com>
+David Goetz <david.goetz@rackspace.com> <david.goetz@gmail.com>
+David Goetz <david.goetz@rackspace.com> <dpgoetz@gmail.com>
+Anne Gentle <anne@openstack.org> <anne.gentle@rackspace.com>
+Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
+Greg Lange <greglange@gmail.com> <glange@rackspace.com>
+Greg Lange <greglange@gmail.com> <greglange+launchpad@gmail.com>
+Gaurav B. Gangalwar <gaurav@gluster.com> gaurav@gluster.com <>
+Joe Arnold <joe@swiftstack.com> <joe@cloudscaling.com>
+Kapil Thangavelu <kapil.foss@gmail.com> kapil.foss@gmail.com <>
+Samuel Merritt <sam@swiftstack.com> <spam@andcheese.org>
+Morita Kazutaka <morita.kazutaka@gmail.com>
+Zhong Yue Luo <lzyeval@gmail.com> lzyeval <lzyeval@gmail.com>
+Russ Nelson <russ@crynwr.com> <nelson@nelson-laptop>
+Marcelo Martins <btorch@gmail.com> <marcelo.martins@rackspace.com>
+Andrew Clay Shafer <acs@parvuscaptus.com> <andrew@cloudscaling.com>
+Soren Hansen <soren@linux2go.dk> <soren.hansen@rackspace.com>
diff --git a/AUTHORS b/AUTHORS
index 12721cb744..be0783a2cc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@ Chuck Thier (cthier@gmail.com)
 
 Contributors
 ------------
+Jesse Andrews (anotherjesse@gmail.com)
 Joe Arnold (joe@swiftstack.com)
 Darrell Bishop (darrell@swiftstack.com)
 James E. Blair (james.blair@rackspace.com)
@@ -27,8 +28,10 @@ Gaurav B. Gangalwar (gaurav@gluster.com)
 Anne Gentle (anne.gentle@rackspace.com)
 Clay Gerrard (clay.gerrard@rackspace.com)
 Mark Gius (launchpad@markgius.com)
-David Goetz (david.goetz@rackspace.com)
+David Goetz (dpgoetz@gmail.com)
+Jonathan Gonzalez V (jonathan.abdiel@gmail.com)
 Soren Hansen (soren@linux2go.dk)
+Derek Higgins (derekh@redhat.com)
 Florian Hines (florian.hines@gmail.com)
 Paul Jimenez (pj@place.org)
 Brian K. Jones (bkjones@gmail.com)
@@ -37,6 +40,7 @@ Ed Leafe (ed.leafe@rackspace.com)
 Zhong Yue Luo (lzyeval@gmail.com)
 Dragos Manolescu (dragosm@hp.com)
 Juan J. Martinez (juan@memset.com)
+Marcelo Martins (btorch@gmail.com)
 Donagh McCabe (donagh.mccabe@hp.com)
 Ewan Mellor (ewan.mellor@citrix.com)
 Samuel Merritt (sam@swiftstack.com)
@@ -44,15 +48,18 @@ Stephen Milton (milton@isomedia.com)
 Russ Nelson (russ@crynwr.com)
 Maru Newby (mnewby@internap.com)
 Colin Nicholson (colin.nicholson@iomart.com)
+Eamonn O'Toole (eamonn.otoole@hp.com)
 Felipe Reyes (freyes@tty.cl)
 Brent Roskos (broskos@internap.com)
 Michael Shuler (mshuler@rackspace.com)
-Andrew Clay Shafer (andrew@cloudscaling.com)
+Andrew Clay Shafer (acs@parvuscaptus.com)
 Scott Simpson (sasimpson@gmail.com)
 Monty Taylor (mordred@inaugust.com)
 Caleb Tennis (caleb.tennis@gmail.com)
+Rainer Toebbicke (Rainer.Toebbicke@cern.ch)
 Fujita Tomonori (fujita.tomonori@lab.ntt.co.jp)
 Kapil Thangavelu (kapil.foss@gmail.com)
+Dean Troyer (dtroyer@gmail.com)
 Daniele Valeriani (daniele@dvaleriani.net)
 Chris Wedgwood (cw@f00f.org)
 Conrad Weidenkeller (conrad.weidenkeller@rackspace.com)