Merge branch 'fc/master' into travis-ci
[git] / Documentation / .gitattributes
1 *.txt whitespace