- Commit merged files (just changing some ending CRLF to LF)

modified:
  storage/connect/json.cpp
  storage/connect/xobject.cpp

storage/connect/json.cpp

@@ -730,6 +730,7 @@ bool JOUTFILE::Escape(const char *s)
       case '\r': fputs("\\r",  Stream); break;
       case '\b': fputs("\\b",  Stream); break;
       case '\f': fputs("\\f",  Stream); break;
+      case '\\': fputs("\\\\", Stream); break;
       case '"':  fputs("\\\"", Stream); break;
       default:
         fputc(s[i], Stream);