X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.mailmap;h=3b2ce578a1a02a86d7a1f0b66b5ea5e51472033b;hb=b63e99500137c913bd801a2f22b6cf88c63b95c5;hp=71ec16acca945eb5c01d4b83c0986214d64a44ff;hpb=14a4091c16d14fd461f576e4bf1395da65e5d95e;p=git.git

diff --git a/.mailmap b/.mailmap
index 71ec16acc..3b2ce578a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,12 +19,14 @@ Horst H. von Brand <vonbrand@inf.utfsm.cl>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Jon Loeliger <jdl@freescale.com>
 Jon Seymour <jon@blackcubes.dyndns.org>
+Junio C Hamano <junio@twinsun.com>
 Karl Hasselström <kha@treskal.com>
 Kent Engstrom <kent@lysator.liu.se>
 Lars Doelle <lars.doelle@on-line ! de>
 Lars Doelle <lars.doelle@on-line.de>
 Lukas Sandström <lukass@etek.chalmers.se>
 Martin Langhoff <martin@catalyst.net.nz>
+Michael Coleman <tutufan@gmail.com>
 Michele Ballabio <barra_cuda@katamail.com>
 Nanako Shiraishi <nanako3@bluebottle.com>
 Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
@@ -35,6 +37,7 @@ Sam Vilain <sam@vilain.net>
 Santi Béjar <sbejar@gmail.com>
 Sean Estabrooks <seanlkml@sympatico.ca>
 Shawn O. Pearce <spearce@spearce.org>
+Steven Grimm <koreth@midwinter.com>
 Theodore Ts'o <tytso@mit.edu>
 Tony Luck <tony.luck@intel.com>
 Uwe Kleine-König <Uwe_Zeisberger@digi.com>
@@ -42,6 +45,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <uzeisberger@io.fsforth.de>
 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
+William Pursell <bill.pursell@gmail.com>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 anonymous <linux@horizon.com>
 anonymous <linux@horizon.net>