Sync with maint

author Junio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:20:07 +0000 (11:20 -0700)

committer Junio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:20:07 +0000 (11:20 -0700)
author: Junio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:20:07 +0000 (11:20 -0700)
committer: Junio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:20:07 +0000 (11:20 -0700)
diff --cc Documentation/git.txt
Simple merge
diff --cc GIT-VERSION-GEN
Simple merge
author	Junio C Hamano <gitster@pobox.com>
author	Mon, 3 Aug 2015 18:20:07 +0000 (11:20 -0700)
committer	Junio C Hamano <gitster@pobox.com>
committer	Mon, 3 Aug 2015 18:20:07 +0000 (11:20 -0700)
		1	2
Documentation/git.txt	patch \|	diff1 \|	diff2 \|	blob \| history
GIT-VERSION-GEN	patch \|	diff1 \|	diff2 \|	blob \| history