From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2008 07:16:26 +0000 (-0700)
Subject: Merge branch 'ph/maint-quiltimport' into maint
X-Git-Tag: v1.5.5-rc0~2^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1b56bc9a1545902db64b8bdce48a499900acfe0b;p=git.git

Merge branch 'ph/maint-quiltimport' into maint

* ph/maint-quiltimport:
  quiltimport: fix misquoting of parsed -p<num> parameter
  git-quiltimport: better parser to grok "enhanced" series files.
---

1b56bc9a1545902db64b8bdce48a499900acfe0b