]> git.neil.brown.name Git - git.git/commitdiff
Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jun 2017 20:52:53 +0000 (13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jun 2017 20:52:53 +0000 (13:52 -0700)

Trivial merge