Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 07:00:11 +0000 (15:00 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 07:00:11 +0000 (15:00 +0800)
commit2be353c1950de300e7524118db1b9f1319760b61
tree255a943a64d499f52000dab94800deadd527e5d7
parent88457992baa1368b48aa79cdf6c03f4a58cf777e
parent434cab3c7946e8675a248c388bca10980be9fec7
Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle
mod/scorm/player.php