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)
commitb0be5f76aef96a55fdfddb5630b83ed98998d012
treef5389e1072553375ef94aa9e95c274c5731c3d53
parent61c8abfb1ef991b485eb105adbab77627724d795
parent7f28e8a58f2a5cd9f7f555ff478ee9a9b73de990
Merge branch 'MDL-51123-master' of git://github.com/jleyva/moodle
mod/scorm/locallib.php