Merge branch 'master_MDL-31652' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 02:57:12 +0000 (15:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 02:57:12 +0000 (15:57 +1300)
1  2 
mod/scorm/locallib.php

Simple merge