Merge tag 'v2.10.4' into maint-2.11
authorJunio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 22:01:31 +0000 (15:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 30 Jul 2017 22:01:31 +0000 (15:01 -0700)
Git 2.10.4

1  2 
cache.h
connect.c
path.c
diff --cc cache.h
Simple merge
diff --cc connect.c
Simple merge
diff --cc path.c
Simple merge