From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 Feb 2012 06:01:14 +0000 (-0800)
Subject: Merge branch 'ld/git-p4-branches-and-labels'
X-Git-Tag: v1.7.10-rc0~131
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8d7ac73014b438fee5a811340d682ece61dda268;p=git.git

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
---

8d7ac73014b438fee5a811340d682ece61dda268