Merge branch 'rc/maint-http-wrong-free'

* rc/maint-http-wrong-free:
  Makefile: some changes for http-related flag documentation
  http.c: fix an invalid free()

Conflicts:
	Makefile

diff --cc Makefile
index 62ad0c2758ed3f464a61d7dc734f634ef43d8fc5,c07aa9a72b31562d73393acf4c6e554e6cb3e399..8dd782fd88d3f1ec3353445ce57cc03c01cf3653
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -24,15 -24,9 +24,15 @@@ all:
  # Define NO_OPENSSL environment variable if you do not have OpenSSL.
  # This also implies BLK_SHA1.
  #
- # Define NO_CURL if you do not have libcurl installed.  git-http-pull and
 +# Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be
 +# able to use Perl-compatible regular expressions.
 +#
 +# Define LIBPCREDIR=/foo/bar if your libpcre header and library files are in
 +# /foo/bar/include and /foo/bar/lib directories.
 +#
+ # Define NO_CURL if you do not have libcurl installed.  git-http-fetch and
  # git-http-push are not built, and you cannot use http:// and https://
- # transports.
+ # transports (neither smart nor dumb).
  #
  # Define CURLDIR=/foo/bar if your curl header and library files are in
  # /foo/bar/include and /foo/bar/lib directories.

diff --cc http.c
Simple merge