Merge tag 'v2.13.5' into maint

author Junio C Hamano <redacted>

Fri, 4 Aug 2017 19:40:37 +0000 (12:40 -0700)

committer Junio C Hamano <redacted>

Fri, 4 Aug 2017 19:40:37 +0000 (12:40 -0700)
author Junio C Hamano <redacted>
Fri, 4 Aug 2017 19:40:37 +0000 (12:40 -0700)
committer Junio C Hamano <redacted>
Fri, 4 Aug 2017 19:40:37 +0000 (12:40 -0700)
diff --cc cache.h
Simple merge
diff --cc connect.c
Simple merge
diff --cc path.c
Simple merge
author	Junio C Hamano <redacted>
	Fri, 4 Aug 2017 19:40:37 +0000 (12:40 -0700)
committer	Junio C Hamano <redacted>
	Fri, 4 Aug 2017 19:40:37 +0000 (12:40 -0700)
		1	2
cache.h	patch \|	diff1 \|	diff2 \|	blob \| history
connect.c	patch \|	diff1 \|	diff2 \|	blob \| history
path.c	patch \|	diff1 \|	diff2 \|	blob \| history