1 files changed, 104 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..2c263e6484
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,104 @@
+# Daniel DeLeo
+Daniel DeLeo <dan@opscode.com>
+Daniel DeLeo <dan@opscode.com> Dan DeLeo <danielsdeleo@mac.com>
+Daniel DeLeo <dan@opscode.com> Dan DeLeo <dan@kallistec.com>
+Daniel DeLeo <dan@opscode.com> danielsdeleo <dan@getchef.com>
+Daniel DeLeo <dan@opscode.com> Daniel DeLeo <danielsdeleo@mac.com>
+
+# Adam Jacob
+Adam Jacob <adam@opscode.com>
+Adam Jacob <adam@opscode.com> Adam Jacob <adam@hjksolutions.com>
+Adam Jacob <adam@opscode.com> Adam Jacob <adam@latte.(none)>
+Adam Jacob <adam@opscode.com> Adam Jacob <adam@ubuntu-apache1.(none)>
+
+# Bryan McLellan
+Bryan McLellan <btm@getchef.com>
+Bryan McLellan <btm@getchef.com> Bryan McLellan <bryan.mclellan@webtrends.com>
+Bryan McLellan <btm@getchef.com> Bryan McLellan <btm@opscode.com>
+Bryan McLellan <btm@getchef.com> Bryan McLellan <btm@loftninjas.org>
+Bryan McLellan <btm@getchef.com> Bryan McLellan <bryanm@widemile.com>
+
+# Lamont Granquist
+Lamont Granquist <lamont@getchef.com>
+Lamont Granquist <lamont@getchef.com> lamont-opscode <lamont@opscode.com>
+Lamont Granquist <lamont@getchef.com> Lamont Granquist <lamont@opscode.com>
+Lamont Granquist <lamont@getchef.com> Lamont Granquist <lamont@scriptkiddie.org>
+Lamont Granquist <lamont@getchef.com> lamont-granquist <lamont@scriptkiddie.org>
+
+# Serdar Sutay
+Serdar Sutay <serdar@opscode.com>
+Serdar Sutay <serdar@opscode.com> sersut <serdar@opscode.com>
+
+# Claire McQuin
+Claire McQuin <claire@getchef.com>
+Claire McQuin <claire@getchef.com> Claire McQuin <mcquin@users.noreply.github.com>
+Claire McQuin <claire@getchef.com> Claire McQuin <claire@opscode.com>
+Claire McQuin <claire@getchef.com> Claire McQuin <clairemcquin@seamcquin01.local>
+
+# John Keiser
+John Keiser <jkeiser@opscode.com>
+John Keiser <jkeiser@opscode.com> jkeiser <jkeiser@opscode.com>
+John Keiser <jkeiser@opscode.com> John Keiser <john@johnkeiser.com>
+John Keiser <jkeiser@opscode.com> John Keiser <johnkeiser@John-Keisers-MacBook-Pro.local>
+
+# Seth Chisamore
+Seth Chisamore <schisamo@getchef.com>
+Seth Chisamore <schisamo@getchef.com> Seth Chisamore <schisamo@opscode.com>
+
+# Joshua Timberman
+Joshua Timberman <joshua@opscode.com>
+Joshua Timberman <joshua@opscode.com> Joshua Timberman <jtimberman@cider.local>
+Joshua Timberman <joshua@opscode.com> Joshua Timberman <jtimberman@users.noreply.github.com>
+Joshua Timberman <joshua@opscode.com> jtimberman <joshua.timberman@gmail.com>
+Joshua Timberman <joshua@opscode.com> jtimberman <joshua@opscode.com>
+Joshua Timberman <joshua@opscode.com> jtimberman <jtimberman@www1test.housepub.org>
+
+# Nuo Yan
+Nuo Yan <nuo@opscode.com>
+Nuo Yan <nuo@opscode.com> Nuo Yan <nuoyan@nuo-yans-macbook-pro.(none)>
+Nuo Yan <nuo@opscode.com> Nuo Yan <nuoyan@nuo-yans-macbook-pro.local>
+
+# Thom May
+Thom May <thom@clearairturbulence.org>
+Thom May <thom@clearairturbulence.org> Thom May <thom.may@betfair.com>
+Thom May <thom@clearairturbulence.org> Thom May <thom@digital-science.com>
+Thom May <thom@clearairturbulence.org> Thom May <thom@virelais.nyc.joostas.com>
+Thom May <thom@clearairturbulence.org> Thom May <tmay@expedia.com>
+
+# Stephen Delano
+Stephen Delano <stephen@opscode.com>
+Stephen Delano <stephen@opscode.com> Stephen Delano <stephen@opscode-stephen.(none)>
+Stephen Delano <stephen@opscode.com> Stephen Delano <stephen@opscode-stephen.local>
+Stephen Delano <stephen@opscode.com> sdelano <stephen@opscode.com>
+
+# AJ Christensen
+AJ Christensen <aj@opscode.com>
+AJ Christensen <aj@opscode.com> AJ Christensen <aj@junglist.gen.nz>
+
+# Seth Falcon
+Seth Falcon <seth@opscode.com>
+Seth Falcon <seth@opscode.com> Seth Falcon <sethfalcon@gmail.com>
+
+# Adam Edwards
+Adam Edwards <adamed@opscode.com>
+Adam Edwards <adamed@opscode.com> adamedx <adamed@getchef.com>
+Adam Edwards <adamed@opscode.com> adamedx <adamed@opscode.com>
+Adam Edwards <adamed@opscode.com> adamedx <admed@opscode.com>
+
+# Prajakta Purohit
+Prajakta Purohit <prajakta@opscode.com>
+Prajakta Purohit <prajakta@opscode.com> PrajaktaPurohit <prajakta@opscode.com>
+
+kaustubh-d <kaustubh@clogeny.com>
+kaustubh-d <kaustubh@clogeny.com> kaustubh <kaustubh.deo@gmail.com>
+kaustubh-d <kaustubh@clogeny.com> kaustubh-d <kausubh@clogeny.com>
+
+# Xabier de Zuazo
+Xabier de Zuazo <xabier@onddo.com>
+Xabier de Zuazo <xabier@onddo.com> Xabier de Zuazo <xabier.zuazo@evandti.com>
+Xabier de Zuazo <xabier@onddo.com> Xabier de Zuazo <xabier@zuazo.org>
+
+# Tim Hinderliter
+Tim Hinderliter <tim@opscode.com>
+Tim Hinderliter <tim@opscode.com> tim@opscode.com <tim@opscode.com>
+Tim Hinderliter <tim@opscode.com> timh <tim@opscode.com>
+\ No newline at end of file