From eb2de037a387a2f20f50a81c973a2efd48d73494 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 5 Jul 2012 16:27:12 -0500
Subject: Update common setup code to latest.

This gets us up to date with common/setup.py and replaces custom nova
autodoc generation with the port of that code found in common.

Change-Id: I2a1c5d2c0fdcf40dbea50cc123b537adb068cdc2
---
 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 5fcd106eda..d372b8cc25 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,7 +43,7 @@
 <justin@fathomdb.com> <justinsb@justinsb-desktop>
 <justin@fathomdb.com> <superstack@superstack.org>
 <lorin@nimbisservices.com> <lorin@isi.edu>
-<masumotok@nttdata.co.jp> Masumoto<masumotok@nttdata.co.jp>
+<masumotok@nttdata.co.jp> <masumotok@nttdata.co.jp>
 <masumotok@nttdata.co.jp> <root@openstack2-api>
 <matt.dietz@rackspace.com> <matthewdietz@Matthew-Dietzs-MacBook-Pro.local>
 <matt.dietz@rackspace.com> <mdietz@openstack>
-- 
cgit v1.2.1