Merge branch 'aw/cvs'
[git] / t / t5100 / patch0007