Merge branch 'maint'
commit7641eb400f8dc1c8b8b0ca8f325c753ae566e156
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Oct 2009 06:57:48 +0000 (16 23:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Oct 2009 07:10:33 +0000 (17 00:10 -0700)
treee1040c294ba8c74c8f808161021b4b9084ac6399
parentc274db7057318835e975c26284f6f9d723b938f3
parentb142da2a5dec8f868a61322e2ab591e9a008ec3b
Merge branch 'maint'

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