tree 495544c81e94b4d2af800e26a9b1f83796de2574
parent 50b4a7807f5f1db79a0a4f4400c29bc00efbd307
parent 70fcaef90bad282cf141a7c2e7ae87b13fe0700e
author Junio C Hamano <gitster@pobox.com> 1493956756 +0900
committer Junio C Hamano <gitster@pobox.com> 1493956756 +0900

Merge branch 'maint-2.6' into maint-2.7