Merge branch 'ld/git-p4-tags-and-labels' into next
commit8b959e51080191e01acfd523e52267547d7af0d8
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2012 19:43:19 +0000 (25 12:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2012 19:43:19 +0000 (25 12:43 -0700)
tree828a560b69ad763e285d442b39b5afe7db0d1293
parent07965a410b1691815413eb6f3a9f88c6a5bd7f68
parent00855b656bf883c607a4adcd5bc7a76711e4b3a3
Merge branch 'ld/git-p4-tags-and-labels' into next

By Luke Diamand
* ld/git-p4-tags-and-labels:
  git p4: fix unit tests