Sam Potts bae04a492a Merge branch 'master' into develop
# Conflicts:
#	demo/index.html
#	dist/plyr.js
2016-11-06 15:55:55 +11:00
..
PiP
2016-11-01 12:00:16 +11:00
2016-11-06 15:55:55 +11:00
2016-10-23 21:21:42 +11:00