From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:30 +0000 (-0800)
Subject: Merge branch 'ls/travis-update-p4-and-lfs'
X-Git-Tag: v2.12.0-rc0~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b08c812f99e8260c7f93966b0ee2b1339120ce29;p=thirdparty%2Fgit.git

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

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

b08c812f99e8260c7f93966b0ee2b1339120ce29