Merge branch 'ph/maint-quiltimport' into maint
commit1b56bc9a1545902db64b8bdce48a499900acfe0b
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2008 07:16:26 +0000 (14 00:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2008 07:16:26 +0000 (14 00:16 -0700)
tree271f9169c23a82aace4fb0e812abedfdcdac9ba6
parent381b851c9b010147bb1fa83a013b7c8f60419026
parent18d077c1bf576d51e2ad09e41b22042b8cb5c9f4
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.