tree 216b983a3c019f5a8a3721550afcb271d2185dbb
parent b3118bdc91876cbc04b7e81dcf7bea71d86ce4f8
parent cfe370c6476392095bc3f18013d195b1cccd6184
author Junio C Hamano <gitster@pobox.com> 1255762078 -0700
committer Junio C Hamano <gitster@pobox.com> 1255762078 -0700

Merge branch 'maint-1.6.4' into maint

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