Merge in data_nocollide branch. Fixes #6968, improves unit testing framework checks...
[jquery.git] / .gitattributes
1 *     eol=lf
2 *.jar binary