Merge branch 'ld/p4-unshelve'

"git p4" learned to "unshelve" shelved commit from P4.

* ld/p4-unshelve:
  git-p4: add unshelve command

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

diff --cc git-p4.py
Simple merge