]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sb/mailmap-updates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Aug 2013 17:11:14 +0000 (10:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Aug 2013 17:11:14 +0000 (10:11 -0700)
* sb/mailmap-updates:
  .mailmap: Multiple addresses of Michael S. Tsirkin

1  2 
.mailmap

diff --cc .mailmap
Simple merge