From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Jul 2013 16:16:39 +0000 (-0700)
Subject: Merge branch 'sb/mailmap-updates'
X-Git-Tag: v1.8.4-rc1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3717c73f6205eada7701d254e5c6aff156a14224;p=thirdparty%2Fgit.git

Merge branch 'sb/mailmap-updates'

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

3717c73f6205eada7701d254e5c6aff156a14224