Merge "Update my mailmap"

2014-02-08 06:43:06 +00:00 · 2014-02-08 06:43:06 +00:00 · 348a81b176
parent 0cda69f6a5 e85620205e
commit 348a81b176
1 changed files with 5 additions and 0 deletions
--- a/.mailmap
+++ b/.mailmap
@ -0,0 +1,5 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+<mr.alex.meade@gmail.com> <hatboy112@yahoo.com>
+<mr.alex.meade@gmail.com> <alex.meade@rackspace.com>