Merge branch 'maint'
commitddebfd1f27110bbcd0e8da0417bc425509af219a
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:42:26 +0000 (31 17:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:42:26 +0000 (31 17:42 -0800)
tree4d2fd8b58d9bc40674ee892fc7b024cc42b9e382
parent99ccabaffa201e867f2073947dcccae3947ec4f1
parent6ac92294b30d7c8619cf15b531448f011dbdcdcc
Merge branch 'maint'

* maint:
  merge: fix out-of-bounds memory access
unpack-trees.c