tree de78540d885e7c790831b3003b9ea45f25fb3352
parent 19533e2c713f240d1f6616bb2db18bf653c10106
parent 2187e112d719109cac64d39e1bd8a04b123b6eed
author Junio C Hamano <gitster@pobox.com> 1500675205 -0700
committer Junio C Hamano <gitster@pobox.com> 1500675205 -0700

Sync with maint

* maint:
  fixes from 'master' for 2.13.4