Sync with 2.12.5
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Sep 2017 05:48:08 +0000 (14:48 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Sep 2017 05:48:08 +0000 (14:48 +0900)
commit1df0306d9b6a9e92c646dab77683c2a72957d03d
tree271f1aeffec78f674d070bfabfc145951a3d7de6
parent7234152e66e52c7601789f6de822bb39590f0595
parent9752ad0bb79f680bca48db7adc45338b298304b0
Sync with 2.12.5

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