Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 18:02:29 +0000 (11:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 18:02:29 +0000 (11:02 -0700)
* js/maint-send-pack-stateless-rpc-deadlock-fix:
  send-pack: unbreak push over stateless rpc
  send-pack: avoid deadlock when pack-object dies early

1  2 
builtin/send-pack.c

Simple merge