Merge branch 'mg/mailmap-update' into maint
commite80014a13e86f47a172620567608e627427ceeeb
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:22:06 +0000 (9 22:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:22:06 +0000 (9 22:22 -0700)
tree9d83a71369114636379f3e3b164963292e164857
parent2870695be0ad337a29c1ddbd75d8c14fc74cae7b
parent08bb03e4754cf285c0fe49d22d2b8ce13d7609a2
Merge branch 'mg/mailmap-update' into maint

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