From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Jan 2011 00:40:09 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=438e47c91da58b27dabd74e3fc24ff71ed37ab58;p=git.git

Merge branch 'master' into next

* master:
  t3032: limit sed branch labels to 8 characters
  t0001,t1510,t3301: use sane_unset which always returns with status 0
  trace.c: ensure NULL is not passed to printf
---

438e47c91da58b27dabd74e3fc24ff71ed37ab58