Merge branch 'maint'

* maint:
http.c: Fix problem with repeated calls of http_init
Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation
Fix import-tars fix.
Update .mailmap with "Michael"
Do not barf on too long action description
Catch empty pathnames in trees during fsck
Don't allow empty pathnames in fast-import
import-tars: be nice to wrong directory modes
git-svn: Added 'find-rev' command
git shortlog documentation: add long options and fix a typo

diff --cc Documentation/git.txt
Simple merge

diff --cc builtin-fetch--tool.c
Simple merge

diff --cc builtin-fsck.c
Simple merge

diff --cc contrib/fast-import/import-tars.perl
Simple merge

diff --cc fast-import.c
Simple merge