Merge branch 'maint'
authorJunio C Hamano <redacted>
Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800)
committerJunio C Hamano <redacted>
Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800)
* maint:
  Fix parsing numeric color values
  INSTALL: git-merge no longer uses cpio


Trivial merge
git clone https://git.99rst.org/PROJECT