Merge branch 'master' into next
commit9f628b22044fd7f51e00f54e264129cfddf8d108
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Jul 2009 00:23:56 +0000 (20 17:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Jul 2009 00:23:56 +0000 (20 17:23 -0700)
treea4571473f0d76855f7eb19ba5bb791423854bffd
parent60aa0c1b7342154863f95d0a49cbacf596af374d
parent2a679c7a3148978a3f58f1c12100383638e744c5
Merge branch 'master' into next

* master:
  git svn: fix reparenting when ugly http(s) URLs are used
  git svn: rename tests that had conflicting numbers