summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-12-23 01:32:57 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-12-23 01:32:57 +0000
commit93dcd9088108b17c44337f556d0c624e802ba788 (patch)
treee04ef4bef195eb9f4bc1955d95d21709cb3990f1 /.mailmap
parent6aabbeda013db5af36de4a82f0e8a9fda4d4d273 (diff)
downloadnova-93dcd9088108b17c44337f556d0c624e802ba788.tar.gz
fix commits from Anthony and Vish that were committed with the wrong email
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 8041e23418..c01f964d25 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>