Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:45 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:45 +0000 (14:53 -0700)
commit63a35025b11bf0e7ef39693aeea3b639a066b7b8
tree6620081ae4586be29e7d0710ef66db13f4bb21fe
parenta3fe55458ae937b159eeb68dc2ae1ec810aa7d7e
parentd92347f59fefb95a2d9240c007a44f408c216fa7
Sync with maint

* maint:
  Almost ready for 2.8.3