Merge branch 'vs/typofix'

author Junio C Hamano <redacted>

Fri, 12 Aug 2016 16:47:37 +0000 (09:47 -0700)

committer Junio C Hamano <redacted>

Fri, 12 Aug 2016 16:47:37 +0000 (09:47 -0700)
author Junio C Hamano <redacted>
Fri, 12 Aug 2016 16:47:37 +0000 (09:47 -0700)
committer Junio C Hamano <redacted>
Fri, 12 Aug 2016 16:47:37 +0000 (09:47 -0700)
diff --cc commit-slab.h
Simple merge
diff --cc sha1_file.c
Simple merge
author	Junio C Hamano <redacted>
	Fri, 12 Aug 2016 16:47:37 +0000 (09:47 -0700)
committer	Junio C Hamano <redacted>
	Fri, 12 Aug 2016 16:47:37 +0000 (09:47 -0700)
		1	2
commit-slab.h	patch \|	diff1 \|	diff2 \|	blob \| history
sha1_file.c	patch \|	diff1 \|	diff2 \|	blob \| history