Update .mailmap.

JuliaLang · Dec 31, 2011 · f0de485 · f0de485
1 parent cf6f13f
commit f0de485
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1,3 +1,7 @@
+JuliaLang <julia-dev@googlegroups.com> <julia-dev@googlegroups.com>
+JuliaLang <julia-dev@googlegroups.com> <julia-math@googlegroups.com>
+
+Jeff Bezanson <jeff.bezanson@gmail.com> <jeff.bezanson@gmail.com>
 Jeff Bezanson <jeff.bezanson@gmail.com> <bezanson@post.harvard.edu>
 Jeff Bezanson <jeff.bezanson@gmail.com> <bezanson@beagle.darwinproject.mit.edu>
 Jeff Bezanson <jeff.bezanson@gmail.com> <bezanson@caspian.caspian.mit.edu>
@@ -6,23 +10,23 @@ Jeff Bezanson <jeff.bezanson@gmail.com> <bezanson@mathstation049.mit.edu>
 Jeff Bezanson <jeff.bezanson@gmail.com> <bezanson@mathstation186.mit.edu>
 Jeff Bezanson <jeff.bezanson@gmail.com> <bezanson@scooby-doo.csail.mit.edu>
 Jeff Bezanson <jeff.bezanson@gmail.com> <bezanson@shaggy.csail.mit.edu>
-Jeff Bezanson <jeff.bezanson@gmail.com> <jeff.bezanson@gmail.com>
 Jeff Bezanson <jeff.bezanson@gmail.com> <jeff@lagann.(none)>
 Jeff Bezanson <jeff.bezanson@gmail.com> <vcloud@julia02.domain.local>
 Jeff Bezanson <jeff.bezanson@gmail.com> <bezanson@evolution.local> 
 
+Stefan Karpinski <stefan@karpinski.org> <stefan@karpinski.org>
 Stefan Karpinski <stefan@karpinski.org> <stefan.karpinski@post.harvard.edu> 
 Stefan Karpinski <stefan@karpinski.org> <stefan.karpinski@gmail.com>
-Stefan Karpinski <stefan@karpinski.org> <stefan@karpinski.org>
 
+Viral B. Shah <viral@mayin.org> <viral@mayin.org>
 Viral B. Shah <viral@mayin.org> <viral@neumann.cs.ucsb.edu>
 Viral B. Shah <viral@mayin.org> <viral@beowulf1.csail.mit.edu>
-Viral B. Shah <viral@mayin.org> <viral@mayin.org>
 
 George Xing <gxing@mit.edu> <gxing@mit.edu>
+George Xing <gxing@mit.edu> <noobiecubie@gmail.com>
 
-Stephan Boyer <boyers@mit.edu> <stephan@ubuntu.ubuntu-domain>
 Stephan Boyer <boyers@mit.edu> <boyers@mit.edu>
+Stephan Boyer <boyers@mit.edu> <stephan@ubuntu.ubuntu-domain>
 Stephan Boyer <boyers@mit.edu> <stephan@julialang.xvm.mit.edu>
 Stephan Boyer <boyers@mit.edu> <stephan@ubuntu.(none)>
 
@@ -31,3 +35,5 @@ Giuseppe Zingales <giuseppe.pet.zingales@gmail.com> <g3@ubuntu.ubuntu-domain>
 
 Jameson Nash <jameson@mit.edu> <jameson@mit.edu>
 Jameson Nash <jameson@mit.edu> <vtjnash@comcast.net>
+
+Alan Edelman <mit.edelman@gmail.com> <mit.edelman@gmail.com>