Merge branch 'ld/p4-multiple-shelves'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jan 2018 21:28:10 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jan 2018 21:28:10 +0000 (13:28 -0800)
"git p4" update.

* ld/p4-multiple-shelves:
  git-p4: update multiple shelved change lists


Trivial merge