From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 22:49:24 +0000 (-0800)
Subject: Merge branch 'ls/travis-update-p4-and-lfs' into maint
X-Git-Tag: v2.11.1~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d27381eeeb451fd3e2072a069c19dcc900e8ae3d;p=thirdparty%2Fgit.git

Merge branch 'ls/travis-update-p4-and-lfs' into maint

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
---

d27381eeeb451fd3e2072a069c19dcc900e8ae3d