tree 7ff9e5e77766fa3f0fae8cea269cb285939a19ef
parent 05318994e7fcb6a652a8329bf7ba7f8d6696ee3c
parent 42536dd9b9829b4eb4e3706e141b3c8bffa3e826
author Junio C Hamano <gitster@pobox.com> 1306428180 -0700
committer Junio C Hamano <gitster@pobox.com> 1306428180 -0700

Merge branch 'jm/maint-diff-words-with-sbe' into maint

* jm/maint-diff-words-with-sbe:
  do not read beyond end of malloc'd buffer