Merge branch 'ld/git-p4-expanded-keywords' into next
commita9004c5cb2204cf950debab328e86de5eefb9da4
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Feb 2012 00:14:00 +0000 (16 16:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Feb 2012 00:14:00 +0000 (16 16:14 -0800)
tree715f2922e8df228eda6aa8f8d313872bd405e7c8
parent404d336f2a2f8f494357e1e4da568a14fb5c3208
parent4da60d350ede8ce60f1a4edc8058a2c15ba71427
Merge branch 'ld/git-p4-expanded-keywords' into next

* ld/git-p4-expanded-keywords:
  git-p4: add initial support for RCS keywords