DOC: update mailmap for release

matthew-brett · matthew-brett · commit 1a6acbeeba31 · 2012-09-11T19:46:16.000+01:00
diff --git a/.mailmap b/.mailmap
@@ -13,7 +13,10 @@ Yaroslav Halchenko <debian@onerussian.com> <yoh-guest@82381867-18eb-0310-98a2-94
 Bertrand Thirion <bertrand.thirion@inria.fr> bthirion <bertrand.thirion@inria.fr>
 Stephan Gerhard <git@unidesign.ch> Stephan Gerhard <git@github.com>
 Christian Haselgrove <christian.haselgrove@umassmed.edu> Christian Haselgrove <Christian.Haselgrove@umassmed.edu>
-CindeeM <cindee@berkeley.edu> cindeem <cindee@berkeley.edu>
+Cindee Madison <cindee@berkeley.edu> CindeeM <cindee@berkeley.edu>
+Cindee Madison <cindee@berkeley.edu> cindeem <cindee@berkeley.edu>
+Ian Nimmo-Smith <iannimmosmith@gmail.com> Ian Nimmo-Smith <ian.nimmo-smith@mrc-cbu.cam.ac.uk>
+Jean-Baptiste Poline <jbpoline@gmail.com> jbpoline <jbpoline@gmail.com>
 Félix C. Morency <felix.morency@gmail.com> Felix C. Morency <felix.c.morency@usherbrooke.ca> Félix C. Morency <felix.c.morency@usherbrooke.ca>
 Félix C. Morency <felix.morency@gmail.com> Félix C. Morency <felix.c.morency@usherbrooke.ca>
 Krish Subramaniam <krish.subramaniam@gmail.com> Krish Subramaniam <krish@monster.nmr.mgh.harvard.edu>

-Original file line number
+Diff line change
 Bertrand Thirion <[email protected]> bthirion <[email protected]>
 Stephan Gerhard <[email protected]> Stephan Gerhard <[email protected]>
 Christian Haselgrove <[email protected]> Christian Haselgrove <[email protected]>
 -CindeeM <[email protected]> cindeem <[email protected]>
 +Cindee Madison <[email protected]> CindeeM <[email protected]>
 +Cindee Madison <[email protected]> cindeem <[email protected]>
 +Ian Nimmo-Smith <[email protected]> Ian Nimmo-Smith <[email protected]>
 +Jean-Baptiste Poline <[email protected]> jbpoline <[email protected]>
 Félix C. Morency <[email protected]> Felix C. Morency <[email protected]> Félix C. Morency <[email protected]>
 Félix C. Morency <[email protected]> Félix C. Morency <[email protected]>
 Krish Subramaniam <[email protected]> Krish Subramaniam <[email protected]>