.mailmap: sync with master

jsquyres · jsquyres · commit c1cc08a5ec22 · 2016-12-14T10:31:03.000-08:00
Signed-off-by: Jeff Squyres &lt;jsquyres@cisco.com&gt;
diff --git a/.mailmap b/.mailmap
@@ -60,6 +60,7 @@ Yohann Burette <yohann.burette@intel.com> <yburette@users.noreply.github.com>
 Yohann Burette <yohann.burette@intel.com> <yohann.burette@intel.com>
 
 MPI Team (bot) <mpiteam@open-mpi.org> <mpiteam@open-mpi.org>
+MPI Team (bot) <mpiteam@open-mpi.org> <mpiteam@build.open-mpi.org>
 
 Yossi Itigin <yosefe@mellanox.com> <yosefe@mellanox.com>
 
@@ -99,3 +100,5 @@ L. R. Rajeshnarayanan <l.r.rajeshnarayanan@intel.com> <l.r.rajeshnarayanan@intel
 
 Aur�lien Bouteiller <bouteill@icl.utk.edu> <bouteill@icl.utk.edu>
 Aur�lien Bouteiller <bouteill@icl.utk.edu> <darter4.nics.utk.edu>
+
+Alex Mikheev <alexm@mellanox.com> <alexm@mellanox.com>

-Original file line number
+Diff line change
 Yohann Burette <[email protected]> <[email protected]>
 MPI Team (bot) <[email protected]> <[email protected]>
 +MPI Team (bot) <[email protected]> <[email protected]>
 Yossi Itigin <[email protected]> <[email protected]>
 Aur�lien Bouteiller <[email protected]> <[email protected]>
 Aur�lien Bouteiller <[email protected]> <darter4.nics.utk.edu>
++
 +Alex Mikheev <[email protected]> <[email protected]>