Andrew's git / gitweb.git / diff
?
Merge branch 'cc/mailmap-tuxfamily'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:18 +0000 (12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 19:33:18 +0000 (12:33 -0700)
* cc/mailmap-tuxfamily:
.mailmap: use Christian Couder's Tuxfamily address

Trivial merge