Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 08:31:53 +0000 (01:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 08:31:53 +0000 (01:31 -0700)
* maint:
Fix severe breakage in "git-apply --whitespace=fix"

Trivial merge