Merge branch 'master_MDL-32147' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Mar 2012 20:51:40 +0000 (09:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Mar 2012 20:51:40 +0000 (09:51 +1300)
1  2 
mod/scorm/lib.php

Simple merge