Merge branch 'master' into develop

# Conflicts:
#	changelog.md
#	dist/plyr.js
This commit is contained in:
Sam Potts
2015-07-20 22:25:31 +10:00
7 changed files with 59 additions and 25 deletions

2
dist/plyr.js vendored

File diff suppressed because one or more lines are too long