From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Dec 2010 20:51:22 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~41
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=32c2264b404e412750dbda3dff5120fabff1dcbd;p=git.git

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
---

32c2264b404e412750dbda3dff5120fabff1dcbd