Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 04:33:12 +0000 (20:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Dec 2010 04:33:12 +0000 (20:33 -0800)
commit4e3a1b24ad4ee3fc7dc21a8b8f39c41202d6b0a5
treefad89c54afd4d08bfa331698e2c52093122ecbc0
parent19128d6cd808800ffc6f14775315e77ece8b8fc7
parentc2ed29b49b557b7bba8be147551cdd6e22fd743b
Merge branch 'maint'

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