diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:22:06 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:22:06 -0700 |
commit | e80014a13e86f47a172620567608e627427ceeeb (patch) | |
tree | 9d83a71369114636379f3e3b164963292e164857 /.mailmap | |
parent | 2870695be0ad337a29c1ddbd75d8c14fc74cae7b (diff) | |
parent | 08bb03e4754cf285c0fe49d22d2b8ce13d7609a2 (diff) | |
download | git-e80014a13e86f47a172620567608e627427ceeeb.tar.gz git-e80014a13e86f47a172620567608e627427ceeeb.tar.xz |
Merge branch 'mg/mailmap-update' into maint
* mg/mailmap-update:
.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -5,6 +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 @@ 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> @@ -60,6 +62,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> +Vitaly "_Vi" Shukela <public_vi@tut.by> William Pursell <bill.pursell@gmail.com> YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> anonymous <linux@horizon.com> |