Merge branch 'sb/mailmap-updates'
commit4fcd30df85a50ad244424e220a0e032cdd544266
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Aug 2013 17:11:14 +0000 (5 10:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Aug 2013 17:11:14 +0000 (5 10:11 -0700)
tree4e738ea2a1d1e7ee09fcecba7721c23da80dd9f5
parentd6f3ab573ee48927c7ef272e56b043758feb0a81
parent487e5707852cca03f924ea4dcfbcad1030db58d8
Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
  .mailmap: Multiple addresses of Michael S. Tsirkin
.mailmap