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)
1  2 
mod/scorm/player.php

Simple merge