Merge branch 'mh/p4' into next
commit169333165154cc5974b9b64e7b5d0e1384274b9b
authorJunio C Hamano <gitster@pobox.com>
Sat, 26 Feb 2011 09:41:53 +0000 (26 01:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Feb 2011 09:41:53 +0000 (26 01:41 -0800)
tree243c7b6a290aa08b04e462b3d66588bf5688104c
parentc95589d5ab3aa3beb9f966fc1b2869303202b40b
parentc9dbab045dea3dc44b81bfaca957fd8c3c7f079b
Merge branch 'mh/p4' into next

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