Merge branch 'mg/mailmap-update' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:22:06 +0000 (22:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:22:06 +0000 (22:22 -0700)
* mg/mailmap-update:
  .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela

1  2 
.mailmap

diff --cc .mailmap
Simple merge