Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Feb 2008 22:20:15 +0000 (14:20 -0800)
commitb828fef678c21d017f18d2094bfdaac94e5fbf7a
tree9aca1a08f3bdcde70d2de9a32ef0360b89b0a053
parente62a641de17b172ffc4d3a803085c8afbfbec3d1
parenta0cf49c16ae37177dcfcefa1149bf09f84721cf5
Merge branch 'maint'

* maint:
  Fix parsing numeric color values
  INSTALL: git-merge no longer uses cpio