From: Junio C Hamano <junkio@cox.net>
Date: Wed, 4 Apr 2007 07:09:36 +0000 (-0700)
Subject: Merge branch 'post1.5.1/p4'
X-Git-Tag: v1.5.2-rc0~98
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb7e3aefa6d6a55530d729e068275beae8a4e2f7;p=git.git

Merge branch 'post1.5.1/p4'

* post1.5.1/p4:
  Added correct Python path to the RPM specfile.
  Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec
  Added git-p4 package to the list of git RPMs.
  Add the WITH_P4IMPORT knob to the Makefile.
---

cb7e3aefa6d6a55530d729e068275beae8a4e2f7