Merge branch 'sp/msysgit'

* sp/msysgit:
  compat/ has subdirectories: do not omit them in 'make clean'
  Fix typo in nedmalloc warning fix
  MinGW: Teach Makefile to detect msysgit and apply specific settings
  Fix warnings in nedmalloc when compiling with GCC 4.4.0
  Add custom memory allocator to MinGW and MacOS builds
  MinGW readdir reimplementation to support d_type
  connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
  git: browsing paths with spaces when using the start command
  MinGW: fix warning about implicit declaration of _getch()
  test-chmtime: work around Windows limitation
  Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
  Quiet make: do not leave Windows behind
  MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore

Conflicts:
	Makefile

diff --cc Makefile
index 735ab079c07b73964b37dfc6c5ac4ee6d1ebcf57,867438de95d7a685f9babc79c3edb76fea110715..41ab8e9e0db59647b2e872757ec05e86f615ea1c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -856,8 -825,6 +859,7 @@@ ifneq (,$(findstring MINGW,$(uname_S))
        pathsep = ;
        NO_PREAD = YesPlease
        NO_OPENSSL = YesPlease
-       NO_CURL = YesPlease
 +      NO_LIBGEN_H = YesPlease
        NO_SYMLINK_HEAD = YesPlease
        NO_IPV6 = YesPlease
        NO_SETENV = YesPlease

diff --cc connect.c
Simple merge