From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Jul 2013 19:59:56 +0000 (-0700)
Subject: Merge branch 'sb/mailmap-updates'
X-Git-Tag: v1.8.4-rc0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec1b80b9c49652d0f1ad4b5f4e1a2efc4ed20029;p=thirdparty%2Fgit.git

Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
  .mailmap: combine more (email, name) to individual persons
  .mailmap: Combine more (email, name) to individual persons
  .mailmap: Map email addresses to names
---

ec1b80b9c49652d0f1ad4b5f4e1a2efc4ed20029