From 93dcd9088108b17c44337f556d0c624e802ba788 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 23 Dec 2010 01:32:57 +0000
Subject: fix commits from Anthony and Vish that were committed with the wrong
 email

---
 .mailmap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 8041e2341..c01f964d2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -24,7 +24,7 @@
 <todd@ansolabs.com> <todd@rubidine.com>
 <vishvananda@gmail.com> <vishvananda@yahoo.com>
 <vishvananda@gmail.com> <root@mirror.nasanebula.net>
+<vishvananda@gmail.com> <root@ubuntu>
+<sleepsonthefloor@gmail.com> <root@tonbuntu>
 # These are from people who failed to set a proper committer
-. <root@tonbuntu>
 . <laner@controller>
-. <root@ubuntu>
-- 
cgit 


From 588b39981d03c61c7b4eafdb489467ab57540d13 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 23 Dec 2010 02:03:39 +0000
Subject: Add Ryan Lane as well

---
 .mailmap | 3 +--
 Authors  | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index c01f964d2..9ab7db743 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,5 +26,4 @@
 <vishvananda@gmail.com> <root@mirror.nasanebula.net>
 <vishvananda@gmail.com> <root@ubuntu>
 <sleepsonthefloor@gmail.com> <root@tonbuntu>
-# These are from people who failed to set a proper committer
-. <laner@controller>
+<rlane@wikimedia.org> <laner@controller>
diff --git a/Authors b/Authors
index 0b048becb..250b3b2ad 100644
--- a/Authors
+++ b/Authors
@@ -24,6 +24,7 @@ Michael Gundlach <michael.gundlach@rackspace.com>
 Monty Taylor <mordred@inaugust.com>
 Paul Voccio <paul@openstack.org>
 Rick Clark <rick@openstack.org>
+Ryan Lane <rlane@wikimedia.org>
 Ryan Lucio <rlucio@internap.com>
 Sandy Walsh <sandy.walsh@rackspace.com>
 Soren Hansen <soren.hansen@rackspace.com>
-- 
cgit