Merge branch 'stable'

diff --combined Makefile
index 3c7ec07ca3a38f836367d344ea4870010e854958,a95a6228539b992df33e948dc04ab7fe5739066a..036fcd7d503fc2c04dd958eac9c5c98921864fbe
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -4,7 -4,7 +4,7 @@@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgi
  CGIT_CONFIG = /etc/cgitrc
  CACHE_ROOT = /var/cache/cgit
  SHA1_HEADER = <openssl/sha.h>
 -GIT_VER = 1.6.0.3
 +GIT_VER = 1.6.1
  GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
  
  # Define NO_STRCASESTR if you don't have strcasestr.
@@@ -128,8 -128,8 +128,8 @@@ cgit.o: VERSIO
  -include $(OBJECTS:.o=.d)
  
  libgit:
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
  
  test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all