Sync with 'master'
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:49:19 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:49:19 +0000 (13:49 -0700)
commit063fe858b89ef8ee27965115fd6b1ed12e42e793
tree346524f3c571d808f328b0e7cf3c1c035ca692a8
parentce353ebfb5bcda1162b2dbd9a9eda682b5880243
parent034667a458057ef1e571973a38ebbdf0045a63e9
Sync with 'master'