From 19eb6d7dd7549c25f7309b7177a72819364a28d4 Mon Sep 17 00:00:00 2001
From: Samuel Merritt <sam@swiftstack.com>
Date: Mon, 17 Mar 2014 10:31:46 -0700
Subject: [PATCH] Copy Swift's .mailmap to swiftclient repo

We had this before when swiftclient was in Swift's source tree, but it
didn't get copied over in the client extraction.

Change-Id: I218edcee265143164ea338e7ea95c19e72579925
---
 .mailmap | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/.mailmap b/.mailmap
index 0f2ffac0..1f2d5673 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1 +1,53 @@
+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> gholt <z-launchpad@brim.net>
+Greg Holt <gholt@rackspace.com> <gregory.holt+launchpad.net@gmail.com>
+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>
+Anne Gentle <anne@openstack.org> annegentle
+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>
+Chmouel Boudjnah <chmouel@enovance.com> <chmouel@chmouel.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>
+Zhongyue Luo <zhongyue.nah@intel.com> <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>
+Soren Hansen <soren@linux2go.dk> <sorhanse@cisco.com>
+Ye Jia Xu <xyj.asmy@gmail.com> monsterxx03 <xyj.asmy@gmail.com>
+Victor Rodionov <victor.rodionov@nexenta.com> <vito.ordaz@gmail.com>
+Florian Hines <syn@ronin.io> <florian.hines@gmail.com>
+Jay Payne <letterj@gmail.com> <letterj@racklabs.com>
+Doug Weimer <dweimer@gmail.com> <dougw@sdsc.edu>
+Li Riqiang <lrqrun@gmail.com> lrqrun <lrqrun@gmail.com>
+Cory Wright <cory.wright@rackspace.com> <corywright@gmail.com>
+Julien Danjou <julien@danjou.info> <julien.danjou@enovance.com>
+David Hadas <davidh@il.ibm.com> <david.hadas@gmail.com>
+Yaguang Wang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
+Liu Siqi <meizu647@gmail.com> dk647 <meizu647@gmail.com>
+James E. Blair <jeblair@openstack.org> <james.blair@rackspace.com>
 Kun Huang <gareth@unitedstack.com> <academicgareth@gmail.com>
+Michael Shuler <mshuler@gmail.com> <mshuler@rackspace.com>
+Ilya Kharin <ikharin@mirantis.com> <akscram@gmail.com>
+Dmitry Ukov <dukov@mirantis.com> Ukov Dmitry <dukov@mirantis.com>
+Tom Fifield <tom@openstack.org> Tom Fifield <fifieldt@unimelb.edu.au>
+Sascha Peilicke <saschpe@gmx.de> Sascha Peilicke <saschpe@suse.de>
+Zhenguo Niu <zhenguo@unitedstack.com> <Niu.ZGlinux@gmail.com>
+Peter Portante <peter.portante@redhat.com> <peter.a.portante@gmail.com>
+Christian Schwede <info@cschwede.de> <christian.schwede@enovance.com>