Merge branch 'pw/maint-p4' into maint
commitb21a226a42d609d4d39522e27423e8323f0db71d
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Nov 2008 21:18:25 +0000 (27 13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Nov 2008 21:18:25 +0000 (27 13:18 -0800)
tree2ddefc838193c9ac4533e392aeec1998ff81fbb3
parenta0178ae2cfd79a1da5d7ddfacadb1e41560bb464
parent3d51c853df5730212f704a526340a5a059dffeda
Merge branch 'pw/maint-p4' into maint

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