1
0
mirror of https://github.com/videojs/video.js.git synced 2025-03-05 15:16:06 +02:00
Steve Heffernan a6019d4207 Merge branch 'stable'
Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.min.css
	dist/video-js/video-js.swf
	dist/video-js/video.js
2014-10-15 16:08:26 -07:00
..
2014-10-15 16:08:26 -07:00