Merge branch 'namespaced' of git://tremily.us/swc-setup-installation-test into assembled

[swc-boot-camp.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 655437e72c8592c36fb1d9b2e25177bfd6eeb4ad..78079fedb52a493bca72d934c45cff0f1ffc1e1a 100644 (file)
--- 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>