Merge branch 'master' into next
[git] / Documentation / .gitattributes
1 *.txt whitespace