Merge git://git.bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2009 23:07:41 +0000 (16:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Oct 2009 23:07:41 +0000 (16:07 -0700)
* git://git.bogomips.org/git-svn:
git-svn: convert SVN 1.5+ / svnmerge.py svn:mergeinfo props to parents
git-svn: add test data for SVN 1.5+ merge, with script.
git-svn: convert SVK merge tickets to extra parents
git-svn: allow test setup script to support PERL env. var
git-svn: add test data for SVK merge, with script.
git svn: fix fetch where glob is on the top-level URL

Trivial merge