From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Nov 2008 21:18:25 +0000 (-0800)
Subject: Merge branch 'pw/maint-p4' into maint
X-Git-Tag: v1.6.1-rc1~15^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b21a226a42d609d4d39522e27423e8323f0db71d;p=thirdparty%2Fgit.git

Merge branch 'pw/maint-p4' into maint

* pw/maint-p4:
  git-p4: fix keyword-expansion regex
---

b21a226a42d609d4d39522e27423e8323f0db71d