Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:19 +0000 (20:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:19 +0000 (20:37 -0700)
* js/maint-send-pack-stateless-rpc-deadlock-fix:
  sideband_demux(): fix decl-after-stmt

1  2 
builtin/send-pack.c

Simple merge