Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 23:41:32 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 23:41:32 +0000 (15:41 -0800)
commit2e18187dfdb805eb42926ca430828b89b45f5da7
tree452b894a4cbd841612b5ac5b6b45a5be336f2050
parent9a9cb40c2f89413b9c3330249e20686b9ab050fb
parente3a80781f5932f5fea12a49eb06f3ade4ed8945c
Merge branch 'master' into next

* master:
  Fourth batch for 2.17