From ff3fd0a3095e0ae7aa10f255c3f46724aa55377b Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Fri, 29 Jun 2012 12:58:26 -0700
Subject: [PATCH] update mailmap

---
 .mailmap | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.mailmap b/.mailmap
index f9222e78a..98d27d5e2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,33 +1,52 @@
+Aaron Culich <aculich@gmail.com> Aaron Culich <aculich@eecs.berkeley.edu>
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> <minrk@Mercury.local>
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> Min RK
 Benjamin Ragan-Kelley <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
+Bradley M. Froehle <brad.froehle@gmail.com> Bradley M. Froehle <bfroehle@math.berkeley.edu>
+Brandon Parsons <brandon@parsonstx.com> Brandon Parsons <brandon.parsons@hp.com>
 Brian E. Granger <ellisonbg@gmail.com> Brian Granger
 Brian E. Granger <ellisonbg@gmail.com> Brian Granger <>
 Brian E. Granger <ellisonbg@gmail.com> bgranger <>
 Brian E. Granger <ellisonbg@gmail.com> bgranger <bgranger@red>
+Paul Ivanov <pivanov314@gmail.com> Paul Ivanov <pi@berkeley.edu>
 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>
+Ernie French <ernestfrench@gmail.com> Ernie French <ernie@gqpbj.com>
+Ernie French <ernestfrench@gmail.com> ernie french <ernestfrench@gmail.com>
+Ernie French <ernestfrench@gmail.com> ernop <ernestfrench@gmail.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 <>
+Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fernando.perez@berkeley.edu>
 Gael Varoquaux <gael.varoquaux@normalesup.org> gael.varoquaux <>
 Gael Varoquaux <gael.varoquaux@normalesup.org> gvaroquaux <gvaroquaux@gvaroquaux-desktop>
+Jonathan March <jmarch@enthought.com> Jonathan March <JDM@MarchRay.net>
+Jonathan March <jmarch@enthought.com> jdmarch <JDM@marchRay.net>
+J?rgen Stenarson <jorgen.stenarson@kroywen.se> J?rgen Stenarson <jorgen.stenarson@bostream.nu>
 Laurent Dufréchou <laurent.dufrechou@gmail.com> <laurent.dufrechou@gmail.com>
 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 <>
 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 <bussonniermatthias@umr168-curn-1-24x-6561.curie.fr>
 Matthias BUSSONNIER <bussonniermatthias@gmail.com> Matthias Bussonnier <carreau@Aspire.(none)>
 Nicolas Rougier <Nicolas.Rougier@inria.fr> <Nicolas.rougier@inria.fr>
+Omar Andrés Zapata Mesa <andresete.chaos@gmail.com> Omar Andres Zapata Mesa <andresete.chaos@gmail.com>
+Piti Ongmongkolkul <piti118@gmail.com> piti118 <piti118@gmail.com>
 Robert Kern <robert.kern@gmail.com> rkern <>
+Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satra@ba5.mit.edu>
+Steven Johnson <steven.johnson@drake.edu> stevenJohnson <steven.johnson@drake.edu>
 Thomas Kluyver <takowl@gmail.com> Thomas <takowl@gmail.com>
+Thomas Spura <tomspur@fedoraproject.org> Thomas Spura <thomas.spura@gmail.com>
+Timo Paulssen <timonator@perpetuum-immobile.de> timo <timonator@perpetuum-immobile.de>
 Ville M. Vainio <vivainio@gmail.com> <vivainio2@WN-W0941>
 Ville M. Vainio <vivainio@gmail.com> ville <ville@VILLE-PC>
 Ville M. Vainio <vivainio@gmail.com> ville <ville@ville-desktop>