Merge branch '2db12bde18f7ca334307830ad87f602f8c231562' into gitattributes

.gitattributes

@@ -0,0 +1,12 @@
+# Force our line endings to be LF, even for Windows
+* text
+
+# Set certain files to be binary
+*.png binary
+*.jpg binary
+*.gif binary
+*.tgz binary
+*.zip binary
+*.tar.gz binary
+
+