Merge branch 'ab/sha1dc-maint' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jun 2017 00:31:53 +0000 (09:31 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jun 2017 00:31:53 +0000 (09:31 +0900)
* ab/sha1dc-maint:
sha1dc: update from upstream
sha1dc: ignore indent-with-non-tab whitespace violations

Trivial merge