Merge branch 'master' into next
commit32c2264b404e412750dbda3dff5120fabff1dcbd
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 20:51:22 +0000 (23 12:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 20:51:22 +0000 (23 12:51 -0800)
tree854951da72e8777ba36576a7278a10b9cc49b133
parent38bda96a397db648fdb27619cac1db4c7719d62e
parent73e7b2ef6c62b3ec345b557acb71a8da4798c70d
Merge branch 'master' into next

* master:
  Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections
  test-lib.sh/test_decode_color(): use octal not hex in awk script