From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 1 Feb 2009 01:42:17 +0000 (-0800)
Subject: Merge branch 'maint-1.6.0' into maint
X-Git-Tag: v1.6.1.3~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6ac92294b30d7c8619cf15b531448f011dbdcdcc;p=git.git

Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  merge: fix out-of-bounds memory access
---

6ac92294b30d7c8619cf15b531448f011dbdcdcc