Merge branch 'maint'

* maint:
post-receive-email: fix accidental removal of a trailing space in signature line
Escape project names before creating pathinfo URLs
Escape project name in regexp
bash: Add completion for git diff --base --ours --theirs
diff-options.txt: document the new "--dirstat" option

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge