From 2f7b032910cce500f09a5d2a257595d573bdb116 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Thu, 25 Oct 2012 11:43:56 -0500
Subject: Pull in latest openstack-common changes and fix a minor PEP8 issue.

Latest openstack-common commit: d887090b5a31672e4a12f302b3818e2b0933bef0

Change-Id: I5a4ffb043ab24f8618a8285112c0c5992ea129e7
---
 .mailmap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index d01ef537..2b533aa8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,7 +6,8 @@ Chris Behrens <cbehrens+github@codestud.com> comstud <cbehrens+github@codestud.c
 <dprince@redhat.com> <dan.prince@rackspace.com>
 Johannes Erdfelt <johannes.erdfelt@rackspace.com> jerdfelt <johannes@erdfelt.com>
 <johannes.erdfelt@rackspace.com> <johannes@erdfelt.com>
-<josh@jk0.org> <jkearney@nova.(none)>
+<josh.kearney@pistoncloud.com> <josh@jk0.org>
+<josh.kearney@pistoncloud.com> <jkearney@nova.(none)>
 <sandy@darksecretsoftware.com> <sandy.walsh@rackspace.com>
 <sandy@darksecretsoftware.com> <sandy@sandywalsh.com>
 Andy Smith <github@anarkystic.com> termie <github@anarkystic.com>
-- 
cgit v1.2.1