Sync with maintmaster
commit14c63a9dc093d6738454f6369a4f5663ca732cf7
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:11:40 +0000 (21 14:11 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:11:40 +0000 (21 14:11 +0900)
tree285523c98a6e9ec57cd401717627bec71a354147
parent719c7020abab6358df891b425684777e719cfa7b
parent95a731ce92c7576d927f0d8a9b27c206cb58c2e6
Sync with maint

* maint:
  Almost ready for 2.15.1