From 61eb1edd15bb8e2bac34a6702810842dfe42de60 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Wed, 2 Mar 2011 13:55:21 +0100
Subject: [PATCH] FIX: mxf --> Xinfan Meng

---
 .mailmap          | 1 +
 doc/whats_new.rst | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 6024c37419da0..5b4dfe5a84feb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,3 +15,4 @@ Vincent Dubourg <vincent.dubourg@gmail.com> dubourg <vincent.dubourg@gmail.com>
 Vincent Dubourg <vincent.dubourg@gmail.com> dubourg <dubourg@PTlami14.(none)>
 Christian Osendorfer <osendorf@gmail.com> osdf <osendorf@gmail.com> 
 James Bergstra <james.bergstra@gmail.com> james.bergstra <james.bergstra@gmail.com>
+Xinfan Meng <mxf3306@gmail.com> mxf <mxf@chomsky.localdomain>
\ No newline at end of file
diff --git a/doc/whats_new.rst b/doc/whats_new.rst
index 8855a992d4ac2..d8de63bfc5337 100644
--- a/doc/whats_new.rst
+++ b/doc/whats_new.rst
@@ -65,7 +65,7 @@ Changelog
   - Allow input sequences of different lengths in :class:`hmm.GaussianHMM`
     [`Ron Weiss`_].
 
-  - Fix bug in affinity propagation caused by incorrect indexing [mxf]
+  - Fix bug in affinity propagation caused by incorrect indexing [Xinfan Meng]
 
 
 People
@@ -89,7 +89,7 @@ People that made this release possible preceeded by number of commits:
     - 1  Paolo Losi
     - 1  VirgileFritsch
     - 1  `Yaroslav Halchenko`_
-    - 1  mxf
+    - 1  Xinfan Meng
 
 
 .. _changes_0_6: