Merge branch 'mh/p4'
commit6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Mar 2011 23:02:28 +0000 (4 15:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Mar 2011 23:02:28 +0000 (4 15:02 -0800)
tree38fec0463961cdf87bdd64510efee61f3dff9ebb
parent08fd8710e277eed73a21c6c5483c57bfeb14e8a7
parentc9dbab045dea3dc44b81bfaca957fd8c3c7f079b
Merge branch 'mh/p4'

* mh/p4:
  git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
contrib/fast-import/git-p4