Merge branch 'sg/travis-retrieve-trash-upon-failure'
[git] / t / t5100 / msg0016
1 and some content
2