Merge branch 'rc/maint-http-wrong-free'
commit0e9b12f874955cba820efd786e176be8ba1acc2e
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2011 18:03:13 +0000 (11 11:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2011 18:03:13 +0000 (11 11:03 -0700)
tree6946d3ebc4adc74c8a26099ff00a9369636f6290
parent5fb249aec763205f8d26370a18c5adb167008dd8
parentd24d905509207fb47abe654789e1248a18785dfc
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
Makefile
http.c