Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 03:07:57 +0000 (15:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 03:07:57 +0000 (15:07 +1200)
commit31dea4fea43a4cb7c752c70c0372738614a69630
tree83810ebfd87307299b915ed1d734bd1252d9ff55
parentda8cd86f173a7487b1e8d5f89cd48d3b799f34f7
parentb33e466550a6619601d612272d6f18f4c11e60f0
Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle
mod/scorm/lib.php
mod/scorm/locallib.php