Merge branch 'va/p4'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800)
* va/p4:
  git-p4: Add copy detection support
  git-p4: Improve rename detection support

1  2 
contrib/fast-import/git-p4

Simple merge