Merge branch 'maint'
commitda4e4a65a27ca912c3f48289acf9ff7a67476c3f
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2009 17:39:17 +0000 (18 10:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2009 17:39:17 +0000 (18 10:39 -0700)
treef8523544be8420fd7da3c440d7ff66220f46307f
parentd978ead4c3933425f54142f2c3fab7f5071e36ef
parentef52aafa0f8b1d34f2ecd9b58f2198711c87cab3
Merge branch 'maint'

* maint:
  http.c: fix compiling with libcurl 7.9.2
  import-tars: support symlinks
  pull, rebase: simplify to use die()
http.c