Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 04:08:31 +0000 (20:08 -0800)
* maint:
  merge-recursive: do not return NULL only to cause segfault
  retry request without query when info/refs?query fails

1  2 
merge-recursive.c
remote-curl.c

Simple merge
diff --cc remote-curl.c
Simple merge