MAINT: Update mailmap.

jseabold · jseabold · commit 4b95b2ef015a · 2014-10-15T11:35:55.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -1,11 +1,14 @@
 Alexander W Blocker <ablocker@gmail.com>  Alexander W Blocker <ablocker@gmail.com> 
+Alex Griffing <argriffi@ncsu.edu> alex <argriffi@ncsu.edu>
 Alexis Roche <alexis.roche@gmail.com>  Alexis Roche <alexis.roche@gmail.com> 
 Ana Martinez Pardo <anamartinezpardo@gmail.com>  Ana Martinez Pardo <anamartinezpardo@gmail.com> 
+Ana Martinez Pardo <anamartinezpardo@gmail.com>  Ana Martinez Pardo <anamartinezpardo@gmailcom> 
 anov <novikova.go.zoom@gmail.com>  anov <novikova.go.zoom@gmail.com> 
 avishaylivne <avishay.livne@gmail.com>  avishaylivne <avishay.livne@gmail.com> 
 Bart Baker <bartbkr@gmail.com>  Bart Baker <bartbkr@gmail.com> 
 Bart Baker <bartbkr@gmail.com>  bartbkr <bartbkr@gmail.com> 
 Bart Baker <bartbkr@gmail.com>  bartbkr@gmail.com <bart@bart-Inspiron-1525.(none)> 
+Ben Duffield <bduffield@palantir.com> benduffield <bduffield@palantir.com>
 Benjamin Thyreau <benjamin@neron>  benjamin.thyreau <> 
 brian.hawthorne <>  brian.hawthorne <> 
 Bruno Rodrigues <rodrigues.bruno@aquitania.org>  Bruno Rodrigues <rodrigues.bruno@aquitania.org> 
@@ -23,7 +26,9 @@ dengemann <denis.engemann@gmail.com>  dengemann <denis.engemann@gmail.com>
 Dieter Vandenbussche <dvandenbussche@axioma.com>  Dieter Vandenbussche <dvandenbussche@axioma.com> 
 Dougal Sutherland <dougal@gmail.com>  Dougal Sutherland <dougal@gmail.com> 
 Enrico Giampieri <enrico.giampieri@unibo.it>  Enrico Giampieri <enrico.giampieri@unibo.it> 
+Eric Chiang <eric.chiang.m@gmail.com> ericchiang <eric.chiang.m@gmail.com>
 evelynmitchell <efm-github@linsomniac.com>  evelynmitchell <efm-github@linsomniac.com> 
+Evgeni Burovski <evgeni@burovski.me> Zhenya <evgeni@burovski.me>
 Fernando Perez <Fernando.Perez@berkeley.edu>  fdo.perez <> 
 Fernando Perez <Fernando.Perez@berkeley.edu>  Fernando Perez <Fernando.Perez@berkeley.edu> 
 Gael Varoquaux <gael.varoquaux@normalesup.org>  Gael Varoquaux <gael.varoquaux@normalesup.org> 
@@ -53,7 +58,8 @@ Mike Crowe <m.j.a.crowe@gmail.com>  Mike Crowe <m.j.a.crowe@googlemail.com>
 Mike Crowe <m.j.a.crowe@gmail.com>  Mike <m.j.a.crowe@googlemail.com> 
 Nathaniel J. Smith <njs@pobox.com>  Nathaniel J. Smith <njs@pobox.com> 
 otterb <itoi@live.com>  otterb <itoi@live.com> 
-padarn <padarn@wilsonp.anu.edu.au>  padarn <padarn@wilsonp.anu.edu.au> 
+Padarn Wilson <padarn@wilsonp.anu.edu.au>  padarn <padarn@wilsonp.anu.edu.au> 
+Padarn Wilson <padarn@gmail.com> Padarn <padarn@Padarns-MacBook-Air.local>
 Paris Sprint Account <paris@grf>  Paris Sprint Account <paris@grf> 
 Paul Hobson <pmhobson@gmail.com>  Paul Hobson <pmhobson@gmail.com> 
 Peter Prettenhofer <peter.prettenhofer@gmail.com>  Peter Prettenhofer <peter.prettenhofer@gmail.com> 
@@ -76,6 +82,7 @@ Thomas Kluyver <takowl@gmail.com>  Thomas Kluyver <takowl@gmail.com>
 tim.leslie <>  tim.leslie <> 
 timmie <timmichelsen@gmx-topmail.de>  timmie <timmichelsen@gmx-topmail.de> 
 Tom Augspurger <thomas-augspurger@uiowa.edu>  TomAugspurger <thomas-augspurger@uiowa.edu> 
+Tom Augspurger <thomas-augspurger@uiowa.edu> Tom Augspurger <tom.augspurger88@gmail.com>
 Tom Waite <twaite@berkeley.edu>  Tom Waite <twaite@berkeley.edu> 
 Tom Waite <twaite@berkeley.edu>  twaite <twaite@TOM-DUAL> 
 Trent Hauck <trent.hauck@gmail.com>  Trent Hauck <trent.hauck@gmail.com> 

-Original file line number
+Diff line change
 Alexander W Blocker <[email protected]>  Alexander W Blocker <[email protected]>
 +Alex Griffing <[email protected]> alex <[email protected]>
 Alexis Roche <[email protected]>  Alexis Roche <[email protected]>
 Ana Martinez Pardo <[email protected]>  Ana Martinez Pardo <[email protected]>
 +Ana Martinez Pardo <[email protected]>  Ana Martinez Pardo <anamartinezpardo@gmailcom>
 anov <[email protected]>  anov <[email protected]>
 avishaylivne <[email protected]>  avishaylivne <[email protected]>
 Bart Baker <[email protected]>  Bart Baker <[email protected]>
 Bart Baker <[email protected]>  bartbkr <[email protected]>
 Bart Baker <[email protected]>  [email protected] <bart@bart-Inspiron-1525.(none)>
 +Ben Duffield <[email protected]> benduffield <[email protected]>
 Benjamin Thyreau <benjamin@neron>  benjamin.thyreau <>
 brian.hawthorne <>  brian.hawthorne <>
 Bruno Rodrigues <[email protected]>  Bruno Rodrigues <[email protected]>
 Dieter Vandenbussche <[email protected]>  Dieter Vandenbussche <[email protected]>
 Dougal Sutherland <[email protected]>  Dougal Sutherland <[email protected]>
 Enrico Giampieri <[email protected]>  Enrico Giampieri <[email protected]>
 +Eric Chiang <[email protected]> ericchiang <[email protected]>
 evelynmitchell <[email protected]>  evelynmitchell <[email protected]>
 +Evgeni Burovski <[email protected]> Zhenya <[email protected]>
 Fernando Perez <[email protected]>  fdo.perez <>
 Fernando Perez <[email protected]>  Fernando Perez <[email protected]>
 Gael Varoquaux <[email protected]>  Gael Varoquaux <[email protected]>
 Mike Crowe <[email protected]>  Mike <[email protected]>
 Nathaniel J. Smith <[email protected]>  Nathaniel J. Smith <[email protected]>
 otterb <[email protected]>  otterb <[email protected]>
 -padarn <[email protected]>  padarn <[email protected]>
 +Padarn Wilson <[email protected]>  padarn <[email protected]>
 +Padarn Wilson <[email protected]> Padarn <[email protected]>
 Paris Sprint Account <paris@grf>  Paris Sprint Account <paris@grf>
 Paul Hobson <[email protected]>  Paul Hobson <[email protected]>
 Peter Prettenhofer <[email protected]>  Peter Prettenhofer <[email protected]>
 tim.leslie <>  tim.leslie <>
 timmie <[email protected]>  timmie <[email protected]>
 Tom Augspurger <[email protected]>  TomAugspurger <[email protected]>
 +Tom Augspurger <[email protected]> Tom Augspurger <[email protected]>
 Tom Waite <[email protected]>  Tom Waite <[email protected]>
 Tom Waite <[email protected]>  twaite <twaite@TOM-DUAL>
 Trent Hauck <[email protected]>  Trent Hauck <[email protected]>