From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Aug 2016 19:33:18 +0000 (-0700)
Subject: Merge branch 'cc/mailmap-tuxfamily'
X-Git-Tag: v2.10.0-rc0~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2dceb92231e04af34d4020c9ff130c52ca0df705;p=thirdparty%2Fgit.git

Merge branch 'cc/mailmap-tuxfamily'

* cc/mailmap-tuxfamily:
  .mailmap: use Christian Couder's Tuxfamily address
---

2dceb92231e04af34d4020c9ff130c52ca0df705