From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 May 2016 20:40:29 +0000 (-0700)
Subject: Merge branch 'ls/p4-lfs'
X-Git-Tag: v2.9.0-rc0~58
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7a959426b61e673032861f7a89ce9c5254bd5830

Merge branch 'ls/p4-lfs'

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

7a959426b61e673032861f7a89ce9c5254bd5830