Code

Merge branch 'sh/p4'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 00:03:58 +0000 (16:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2007 00:03:58 +0000 (16:03 -0800)
* sh/p4:
  git-p4: Fix direct import from perforce after fetching changes through git from origin


Trivial merge