Merge branch 'ls/travis-p4-on-macos'

Update the definition of the MacOSX test environment used by TravisCI. * ls/travis-p4-on-macos: travis-ci: fix Perforce install on macOS

Junio C Hamano committed Jan 31, 2017 at 13:15 UTC 4e170adc8ad654bddb9421a4bf51bb4802656262

No changes.