Merge branch 'jk/mailmap-cleanup' into maint
commitccc3ae799c61ac9ea812396de2e28bd3c9ac2060
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Dec 2012 04:36:42 +0000 (22 20:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Dec 2012 04:36:42 +0000 (22 20:36 -0800)
tree58809fa2c787e45ff9376e99e5c683f92874518e
parent66afe50b439e4d83679d12639dd084bcab0486f0
parent53474eb92ff0571e0b1eacd88d638692b96a2018
Merge branch 'jk/mailmap-cleanup' into maint

* 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