Merge branch 'nm/grep-object-sha1-lock'

* nm/grep-object-sha1-lock: grep: Fix race condition in delta_base_cache Conflicts: builtin/grep.c

Junio C Hamano committed Oct 5, 2011 at 12:35 UTC 00723b02912cc9dae1ee5601ab4b942fdd42ff52

No changes.