1
0
mirror of https://github.com/videojs/video.js.git synced 2025-02-20 12:33:28 +02:00
Steve Heffernan 624bf16070 Merge branch 'master' into fix-flash-ready
Conflicts:
	src/js/media/flash.js
	test/unit/flash.js
2014-07-28 17:27:29 -07:00
..
2013-02-08 17:18:49 -05:00
2014-06-13 13:41:23 -07:00