From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 12 Oct 2008 20:21:17 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~150
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5c283eb13c94be6ca974aa722159dc9838d10d97;p=git.git

Merge branch 'maint'

* maint:
  test-lib: fix broken printf
  git apply --directory broken for new files
---

5c283eb13c94be6ca974aa722159dc9838d10d97