Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Oct 2009 06:57:48 +0000 (23:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Oct 2009 07:10:33 +0000 (00:10 -0700)
* maint:
GIT 1.6.5.1
grep: do not segfault when -f is used

Trivial merge