Merge branch 'maint'

* maint:
RelNotes-1.5.3.5: fix typo
Delay pager setup in git blame
git-cvsimport: really convert underscores in branch names to dots with -u

diff --cc builtin-blame.c
Simple merge