Merge pull request #69 from rodo/master

Add .mailmap to clean up the output of `git shortlog -nes`
apache · Nov 4, 2013 · 264b7c468149d11d39ca0069ffd2c4ef119bb4c6 · 264b7c4
2 parents 9745617 + 6fedbb4
commit 264b7c468149d11d39ca0069ffd2c4ef119bb4c6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,2 @@
+Joe Williams <williams.joe@gmail.com> <joe@joetify.com>
+Joe Williams <williams.joe@gmail.com> <williams.joe@gmail.com>