From 251021c455b85bc08874f8559e3061b504e69d46 2012-06-02 22:42:30
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2012-06-02 22:42:30
Subject: [PATCH] Small fixes to mailmap file

---

diff --git a/.mailmap b/.mailmap
index 2d71e10..f9222e7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,22 +6,30 @@ Brian E. Granger <ellisonbg@gmail.com> Brian Granger <>
 Brian E. Granger <ellisonbg@gmail.com> bgranger <>
 Brian E. Granger <ellisonbg@gmail.com> bgranger <bgranger@red>
 Evan Patterson <epatters@enthought.com> <epatters@EPattersons-MacBook-Pro.local>
+Evan Patterson <epatters@enthought.com> <epatters@evan-laptop.localdomain>
 Evan Patterson <epatters@enthought.com> <epatters@caltech.edu>
+Evan Patterson <epatters@enthought.com> <ejpatters@gmail.com>
+Evan Patterson <epatters@enthought.com> epatters <ejpatters@gmail.com>
 Evan Patterson <epatters@enthought.com> epatters <epatters@enthought.com>
+Fernando Perez <Fernando.Perez@berkeley.edu> <fperez.net@gmail.com>
 Fernando Perez <Fernando.Perez@berkeley.edu> fperez <>
 Fernando Perez <Fernando.Perez@berkeley.edu> fptest <>
 Fernando Perez <Fernando.Perez@berkeley.edu> fptest1 <>
 Gael Varoquaux <gael.varoquaux@normalesup.org> gael.varoquaux <>
 Gael Varoquaux <gael.varoquaux@normalesup.org> gvaroquaux <gvaroquaux@gvaroquaux-desktop>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> <laurent.dufrechou@gmail.com>
-Laurent Dufréchou <laurent.dufrechou@gmail.com> Laurent Dufréchou <laurent@Pep>
+Laurent Dufréchou <laurent.dufrechou@gmail.com> <laurent@Pep>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent dufrechou <>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent.dufrechou <>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> laurent.dufrechou@gmail.com <>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> ldufrechou <ldufrechou@PEP>
+Matthias BUSSONNIER <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
+Matthias BUSSONNIER <bussonniermatthias@gmail.com> Matthias Bussonnier <carreau@Aspire.(none)>
+Nicolas Rougier <Nicolas.Rougier@inria.fr> <Nicolas.rougier@inria.fr>
 Robert Kern <robert.kern@gmail.com> rkern <>
+Thomas Kluyver <takowl@gmail.com> Thomas <takowl@gmail.com>
 Ville M. Vainio <vivainio@gmail.com> <vivainio2@WN-W0941>
-Ville M. Vainio <vivainio@gmail.com> vivainio <>
-Ville M. Vainio <vivainio@gmail.com> ville <ville@ville-desktop>
 Ville M. Vainio <vivainio@gmail.com> ville <ville@VILLE-PC>
+Ville M. Vainio <vivainio@gmail.com> ville <ville@ville-desktop>
+Ville M. Vainio <vivainio@gmail.com> vivainio <>
 Walter Doerwald <walter@livinglogic.de> walter.doerwald <>