2c75f66c by Tom Johnson

Merge branch 'feature/basic-playback' of github.com:brightcove/videojs-contrib-h…

…ls into feature/basic-playback
2 parents 499cf4b3 8150c1ea
1 [![Build Status](https://travis-ci.org/bclwhitaker/videojs-contrib-hls.png)](https://travis-ci.org/bclwhitaker/videojs-contrib-hls) 1 [![Build Status](https://travis-ci.org/brightcove/videojs-contrib-hls.png)](https://travis-ci.org/brightcove/videojs-contrib-hls)
2 2
3 # video.js HLS Plugin 3 # video.js HLS Plugin
4 4
......