Merge branch 'contrib'
[core.git] / .gitattributes