Merge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:49:18 +0000 (12:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:49:18 +0000 (12:49 +0800)
1  2 
mod/scorm/locallib.php

Simple merge