Merge branch 'cc/mailmap-tuxfamily'
commit2dceb92231e04af34d4020c9ff130c52ca0df705
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:18 +0000 (10 12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:18 +0000 (10 12:33 -0700)
treef265a36bda720d7aa05e288b08de41e12d83c906
parentdb40a622395397c84c247d343ef62acc8775d6b2
parentb3cbdd41cd5fbf9a33027f9dfe199fc77158dc93
Merge branch 'cc/mailmap-tuxfamily'

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