From bcabcc8b7d053d556aa5a269929fe8c413e7a214 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 23 Nov 2012 08:48:45 -0500
Subject: [PATCH] .mailmap: standardize identifiers for Joshua, Katy, Matt, and
 Sri

---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index 655437e..78079fe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,7 @@
+Joshua Ryan Smith <joshua.r.smith@gmail.com> <joshua.r.smith@gmail.com>
+Katy Huff <katyhuff@gmail.com> <katyhuff@gmail.com>
 Lynne Williams <williams.lynne99@gmail.com> <alw@Lynne-Williamss-MacBook.local>
 Lynne Williams <williams.lynne99@gmail.com> <williams.lynne99@gmail.com>
+Matt Davis <jiffyclub@gmail.com> <jiffyclub.programatic@gmail.com>
 Matt Davis <jiffyclub@gmail.com> <jiffyclub@gmail.com>
+Sri Hari Krishna Narayanan <sriharikrishna@gmail.com> <snarayan@mcswl169.mcs.anl.gov>
-- 
2.26.2