Merge branch 'jk/mailmap-cleanup'
commit675a0fe297e88e0fab2ee9b311d4ebb3c3bfef28
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Dec 2012 23:18:20 +0000 (21 15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Dec 2012 23:18:20 +0000 (21 15:18 -0800)
tree641acc7035a0ea72c7b0b00958ad017fb1443842
parent18499ba694711c02a5bc729b7f8e362dd760b10a
parent53474eb92ff0571e0b1eacd88d638692b96a2018
Merge branch 'jk/mailmap-cleanup'

Update various entries in our .mailmap file.

* jk/mailmap-cleanup:
  contrib: update stats/mailmap script
  .mailmap: normalize emails for Linus Torvalds
  .mailmap: normalize emails for Jeff King
  .mailmap: fix broken entry for Martin Langhoff
  .mailmap: match up some obvious names/emails