From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 25 Jul 2009 08:31:53 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc3~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f5e3ca7d1d9c987c5a50934f1acdbad44163f3b;p=git.git

Merge branch 'maint'

* maint:
  Fix severe breakage in "git-apply --whitespace=fix"
---

8f5e3ca7d1d9c987c5a50934f1acdbad44163f3b