Merge branch 'MDL-51123-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jan 2016 11:01:47 +0000 (11:01 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jan 2016 11:01:47 +0000 (11:01 +0000)
1  2 
mod/scorm/locallib.php

Simple merge