Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 20:51:22 +0000 (12:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 20:51:22 +0000 (12:51 -0800)
* master:
  Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections
  test-lib.sh/test_decode_color(): use octal not hex in awk script


Trivial merge