Merge branch 'MDL-44093-master-flowplayer' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Feb 2016 09:04:15 +0000 (09:04 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Feb 2016 09:04:15 +0000 (09:04 +0000)

Trivial merge