Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 02:16:19 +0000 (18:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jan 2010 02:16:19 +0000 (18:16 -0800)
* maint:
  Update draft release notes to 1.6.6.1
  grep: NUL terminate input from a file
  fast-import: tag may point to any object type

1  2 
builtin-grep.c
fast-import.c

diff --cc builtin-grep.c
Simple merge
diff --cc fast-import.c
Simple merge