Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into next
commitbf02879d86e382c8bf29604a37390410db584004
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:59:52 +0000 (28 21:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:59:52 +0000 (28 21:59 -0700)
tree1a2e1c01d586f2937bbd6a7a5aa204af3d288cc6
parentfbedd77c112264717e623c078092add1f5bc763d
parent5856b5f568ba957a0ea094fa676641ab246021fc
Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into next

* sp/maint-http-backend-die-triggers-die-recursively:
  http-backend: Don't infinite loop during die()

Conflicts:
http-backend.c
http-backend.c