Merge branch 'ls/travis-update-p4-and-lfs'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:30 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:30 +0000 (14:45 -0800)
The default Travis-CI configuration specifies newer P4 and GitLFS.

* ls/travis-update-p4-and-lfs:
travis-ci: update P4 to 16.2 and GitLFS to 1.5.2 in Linux build

Trivial merge