tree 53520d0d729f8bf79736e5b970f1012416f3197a
parent 3d9c5b5c4461957fbbc0479e037990db04ebb740
parent 39aaab109972d6bbc1d0ffe5d4de47bbd4b8bb07
author Junio C Hamano <gitster@pobox.com> 1506059130 +0900
committer Junio C Hamano <gitster@pobox.com> 1506059130 +0900

Sync with 2.11.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>