Merge branch 'rj/remove-unused-mktemp' into maint

author Junio C Hamano <gitster@pobox.com>

Tue, 21 Mar 2017 22:03:24 +0000 (15:03 -0700)

committer Junio C Hamano <gitster@pobox.com>

Tue, 21 Mar 2017 22:03:24 +0000 (15:03 -0700)
author Junio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:24 +0000 (15:03 -0700)
committer Junio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:24 +0000 (15:03 -0700)
diff --cc cache.h
Simple merge
diff --cc config.mak.uname
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Tue, 21 Mar 2017 22:03:24 +0000 (15:03 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 21 Mar 2017 22:03:24 +0000 (15:03 -0700)
		1	2
cache.h	patch \|	diff1 \|	diff2 \|	blob \| history
config.mak.uname	patch \|	diff1 \|	diff2 \|	blob \| history