From 746b78d637724b369477270f518aa09768c5124e Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 5 Jul 2013 16:39:50 -0400
Subject: Clean up hacking and path issues with d2to1

We imported in another code base. It takes a little bit of path
adjusting to get things right.

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

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 18221d4..373b96a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,6 @@
 # Format is:
 # <preferred e-mail> <other e-mail 1>
 # <preferred e-mail> <other e-mail 2>
+Davanum Srinivas <dims@linux.vnet.ibm.com> <davanum@gmail.com>
+Erik M. Bray <embray@stsci.edu> Erik Bray <embray@stsci.edu>
 Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
-- 
cgit v1.2.1