Merge branch 'maint-1.7.0' into maint-1.7.1
[git] / t / t5100 / patch0007