Sync with 2.6.3
authorJunio C Hamano <redacted>
Thu, 5 Nov 2015 20:22:13 +0000 (12:22 -0800)
committerJunio C Hamano <redacted>
Thu, 5 Nov 2015 20:22:34 +0000 (12:22 -0800)
Signed-off-by: Junio C Hamano <redacted>

Trivial merge
git clone https://git.99rst.org/PROJECT