Code

Merge branch 'va/p4-branch-import-test-update'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:33 +0000 (13:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:33 +0000 (13:18 -0700)
* va/p4-branch-import-test-update:
  git-p4: simple branch tests edits


Trivial merge