Merge branch 'lh/merge'
[git] / t / t5100 / patch0007