Merge branch 'mg/mailmap-update'
commit59d1e01d69865cb2238e01102c6987e4e1d71a32
authorJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 19:28:40 +0000 (3 12:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 19:28:40 +0000 (3 12:28 -0700)
treeb7167e13caa1b40e671668ad1b778d1cf1e960df
parentc2c6bcd3fa99cd446e15783473c958cee42a1543
parent08bb03e4754cf285c0fe49d22d2b8ce13d7609a2
Merge branch 'mg/mailmap-update'

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