X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.mailmap;h=5529b198e8d14decbe4ad99db3f7fb632de0439d;hb=a62d6d84c67cebd71e8d88171a2ebe0bf3aca8a0;hp=aa8ee6b3f1671bbc3a07af7be544c4f83d0d7b1b;hpb=1a8b76912e6ccef6bec3531eec30a0693bc25ae7;p=git.git

diff --git a/.mailmap b/.mailmap
index aa8ee6b3f..5529b198e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,13 +19,16 @@ 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>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
 René Scharfe <rene.scharfe@lsrfire.ath.cx>
@@ -41,6 +44,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>