Merge branch 'master' into bug13658-branch
[platform/upstream/glibc.git] / .gitattributes
1 timezone/* -whitespace