Merge branch 'master_MDL-37696' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 21:19:31 +0000 (10:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 21:19:31 +0000 (10:19 +1300)
1  2 
mod/scorm/player.php

Simple merge