Code

Merge branch 'maint-1.6.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:42:17 +0000 (17:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:42:17 +0000 (17:42 -0800)
* maint-1.6.0:
  merge: fix out-of-bounds memory access

1  2 
unpack-trees.c

diff --cc unpack-trees.c
Simple merge