Merge branch 'master' of https://github.com/eiffelhub/json

contrib/library/text/parser/json/.gitattributes

@@ -0,0 +1,9 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.e text
+*.ecf text
+*.bat text
+*.json text