From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Dec 2012 23:18:20 +0000 (-0800)
Subject: Merge branch 'jk/mailmap-cleanup'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=675a0fe297e88e0fab2ee9b311d4ebb3c3bfef28;p=git.git

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

675a0fe297e88e0fab2ee9b311d4ebb3c3bfef28