Merge branch 'master' into cloud-interface
[contrib/iotivity.git] / .gitattributes
1 \r
2 *.dat binary\r