From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Dec 2012 04:36:42 +0000 (-0800)
Subject: Merge branch 'jk/mailmap-cleanup' into maint
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ccc3ae799c61ac9ea812396de2e28bd3c9ac2060;p=git.git

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
---

ccc3ae799c61ac9ea812396de2e28bd3c9ac2060