Merge branch 'pw/maint-p4' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Nov 2008 21:18:25 +0000 (13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Nov 2008 21:18:25 +0000 (13:18 -0800)
* pw/maint-p4:
git-p4: fix keyword-expansion regex

Trivial merge