Merge branch 'ld/git-p4-branches-and-labels'
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:14 +0000 (22:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Feb 2012 06:01:14 +0000 (22:01 -0800)
commit8d7ac73014b438fee5a811340d682ece61dda268
tree171379178b230d8a4d3a965fad61655657ea7b7e
parent7010146f90abf0e4954690f6cd38a8463786fec7
parenta080558ed77952b2394499531edc324eb2885d67
Merge branch 'ld/git-p4-branches-and-labels'

* ld/git-p4-branches-and-labels:
  git-p4: label import fails with multiple labels at the same changelist
  git-p4: add test for p4 labels
  git-p4: importing labels should cope with missing owner
  git-p4: cope with labels with empty descriptions
  git-p4: handle p4 branches and labels containing shell chars
contrib/fast-import/git-p4