Merge branch 'mc/git-p4-prepare-p4-only'

* mc/git-p4-prepare-p4-only: git-p4: Do not include diff in spec file when just preparing p4

Junio C Hamano committed Jun 6, 2014 at 11:38 UTC eb5398a89122e4345b1fd3cab4f5630290bb3d0e

No changes.