Merge branch 'km/avoid-cp-a' into maint
[git] / t / t5100 / msg0016
1 and some content
2