Merge branch 'maint'

* maint:
  Replace the word 'update-cache' by 'update-index' everywhere
  cvsimport: fix usage of cvsimport.module
  t7003-filter-branch: Fix test of a failing --msg-filter.
  cvsimport: miscellaneous packed-ref fixes
  cvsimport: use rev-parse to support packed refs
  Add basic cvsimport tests

diff --cc Documentation/user-manual.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc configure.ac
Simple merge

diff --cc git-cvsimport.perl
Simple merge