Merge branch 'master' into next
commitb306ed2fa3a1a6ec25bfd372b883c9638f98f2ab
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 03:42:33 +0000 (19 19:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 03:42:38 +0000 (19 19:42 -0800)
tree66984ee8ec9812eb4e9e1104b8e16f98a28985d7
parent2cd0ddca4b6f2ff24fcd7b24030c97ec20ead85c
parent5b15950ac414a8a2d4f5eb480712abcc9fe176d2
Merge branch 'master' into next

* master:
  Makefile: honor NO_CURL when setting REMOTE_CURL_* variables
  bisect: fix singular/plural grammar nit
Makefile
bisect.c