Merge branch 'cc/mailmap-tuxfamily'
authorJunio C Hamano <redacted>
Wed, 10 Aug 2016 19:33:18 +0000 (12:33 -0700)
committerJunio C Hamano <redacted>
Wed, 10 Aug 2016 19:33:18 +0000 (12:33 -0700)
* cc/mailmap-tuxfamily:
  .mailmap: use Christian Couder's Tuxfamily address


Trivial merge
git clone https://git.99rst.org/PROJECT