Merge branch 'maint-1.6.0' into maint
[git] / Documentation / .gitattributes
1 *.txt whitespace