From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 28 Feb 2010 19:41:57 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~128
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dc05d73104fda239fc03342e0b53aa5741c53531;p=git.git

Merge branch 'maint'

* maint:
  Git 1.7.0.1
  Remove reference to GREP_COLORS from documentation
  sha1_name: fix segfault caused by invalid index access
---

dc05d73104fda239fc03342e0b53aa5741c53531