From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Dec 2010 04:33:12 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e3a1b24ad4ee3fc7dc21a8b8f39c41202d6b0a5;p=git.git

Merge branch 'maint'

* maint:
  test-lib.sh/test_decode_color(): use octal not hex in awk script
---

4e3a1b24ad4ee3fc7dc21a8b8f39c41202d6b0a5