Merge branch 'maint'

* 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

diff --cc builtin-grep.c
Simple merge

diff --cc fast-import.c
Simple merge