Merge branch '2_1_11'

.gitattributes

@@ -1,25 +1 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.txt text
-*.rst text
-.project
-.pydevproject
-
-# Declare files that will always have LF line endings on checkout.
-*.py text eol=lf
-*.sh text eol=lf
-*.plist text eol=lf
-
-# Declare files that will always have CRLF line endings on checkout.
-*.iss text eol=crlf
-*.bat text eol=crlf
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpg binary
-*.gif binary
-*.exe binary
-*.prefs binary
+* -text