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