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