From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Oct 2009 06:47:58 +0000 (-0700)
Subject: Merge branch 'maint-1.6.4' into maint
X-Git-Tag: v1.6.5.1~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=050dfc4535578c2c49832ffeb3f05dbd4c6adff2;p=git.git

Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
  grep: do not segfault when -f is used
---

050dfc4535578c2c49832ffeb3f05dbd4c6adff2