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

Junio C Hamano committed Aug 11, 2011 at 11:03 UTC 0e9b12f874955cba820efd786e176be8ba1acc2e

No changes.