From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 10 Apr 2010 05:22:06 +0000 (-0700)
Subject: Merge branch 'mg/mailmap-update' into maint
X-Git-Tag: v1.7.1-rc1~3^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e80014a13e86f47a172620567608e627427ceeeb?hp=-c

Merge branch 'mg/mailmap-update' into maint

* mg/mailmap-update:
.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
---

e80014a13e86f47a172620567608e627427ceeeb
diff --combined .mailmap
index 88bd01e16d,c5073096ec..a8091eb5df
--- a/.mailmap
+++ b/.mailmap
@@@ -5,6 -5,7 +5,7 @@@
  # same person appearing not to be so.
  #
  
+ Alex Bennée <kernel-hacker@bennee.com>
  Alexander Gavrilov <angavrilov@gmail.com>
  Aneesh Kumar K.V <aneesh.kumar@gmail.com>
  Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
@@@ -15,6 -16,7 +16,7 @@@ Daniel Barkalow <barkalow@iabervon.org
  David D. Kilzer <ddkilzer@kilzer.net>
  David KÃ¥gedal <davidk@lysator.liu.se>
  David S. Miller <davem@davemloft.net>
+ Deskin Miller <deskinm@umich.edu>
  Dirk Süsserott <newsletter@dirk.my1.cc>
  Fredrik Kuivinen <freku045@student.liu.se>
  H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
@@@ -36,7 -38,6 +38,7 @@@ Li Hong <leehong@pku.edu.cn
  Lukas Sandström <lukass@etek.chalmers.se>
  Martin Langhoff <martin@catalyst.net.nz>
  Michael Coleman <tutufan@gmail.com>
 +Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
  Michael W. Olson <mwolson@gnu.org>
  Michele Ballabio <barra_cuda@katamail.com>
  Nanako Shiraishi <nanako3@bluebottle.com>
@@@ -60,6 -61,7 +62,7 @@@ Uwe Kleine-König <ukleinek@informatik.
  Uwe Kleine-König <uzeisberger@io.fsforth.de>
  Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
  Ville Skyttä <scop@xemacs.org>
+ Vitaly "_Vi" Shukela <public_vi@tut.by>
  William Pursell <bill.pursell@gmail.com>
  YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
  anonymous <linux@horizon.com>