Code

Merge branch 'jk/maint-apply-no-binary' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:05 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:05 +0000 (11:39 -0700)
* jk/maint-apply-no-binary:
  apply: don't segfault on binary files with missing data


Trivial merge