Merge branch 'master' into next
commit44bcd1fd443fe97c9bf632ed787ba85a8b70b942
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 21:22:07 +0000 (11 14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 21:22:07 +0000 (11 14:22 -0700)
tree4887ce5ef2e4799205d5e36de75d191de3c717c6
parent3aa4ac5c4da1eb86b621339376fa70f943e465fe
parent7980e41746bc5de91eea775f9142ce44b1100361
Merge branch 'master' into next

* master:
  post-receive-email: remove spurious commas in email subject
  fast-import: export correctly marks larger than 2^20-1
  t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
  diff: strip extra "/" when stripping prefix
fast-import.c