Merge branch 'master_MDL-35737' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 12 Dec 2012 00:43:29 +0000 (08:43 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 12 Dec 2012 00:43:29 +0000 (08:43 +0800)
1  2 
mod/scorm/locallib.php

Simple merge