tree 271f1aeffec78f674d070bfabfc145951a3d7de6
parent 7234152e66e52c7601789f6de822bb39590f0595
parent 9752ad0bb79f680bca48db7adc45338b298304b0
author Junio C Hamano <gitster@pobox.com> 1506059288 +0900
committer Junio C Hamano <gitster@pobox.com> 1506059288 +0900

Sync with 2.12.5

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