From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 May 2016 21:40:08 +0000 (-0700)
Subject: Merge branch 'ls/p4-lfs' into HEAD
X-Git-Tag: v2.8.3~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=803fd70ceee3b86861d8b09b27861c4f85828b82;p=git

Merge branch 'ls/p4-lfs' into HEAD

Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.

* ls/p4-lfs:
  git-p4: fix Git LFS pointer parsing
  travis-ci: express Linux/OS X dependency versions more clearly
  travis-ci: update Git-LFS and P4 to the latest version
---

803fd70ceee3b86861d8b09b27861c4f85828b82