Merge branch 'ls/p4-map-user'

"git p4" now allows P4 author names to be mapped to Git author
names.

* ls/p4-map-user:
git-p4: map a P4 user to Git author name and email address

diff --cc Documentation/git-p4.txt
Simple merge

diff --cc git-p4.py
Simple merge