Merge branch 'maint-1.6.0' into maint
commit6ac92294b30d7c8619cf15b531448f011dbdcdcc
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:42:17 +0000 (31 17:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 01:42:17 +0000 (31 17:42 -0800)
tree43c48771b1ddef478d944cd0af7d257607515568
parentb296e8fce6de6a40a41b5168dfbe735d11255256
parentc7cddc1a2f365e4f4aea71b700c0b833eb436fee
Merge branch 'maint-1.6.0' into maint

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