Merge branch 'maint-1.5.6' into maint-1.6.0
[git] / t / t5100 / patch0007