Merge branch 'MDL-52459-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Jan 2016 10:22:39 +0000 (18:22 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:20 +0000 (10:15 +0800)
commit25dbed8b9e2228262df904148511a4002e64e3bc
tree3c1f4240b98ca6e8935f4100c0a024c1ff1b14ea
parentaeba2257f4cb6538d6cd2eacc04e57a298ce2ceb
parent7f062ebeddcc39277c62df5fbe575c72c1e113d0
Merge branch 'MDL-52459-master' of git://github.com/jleyva/moodle
mod/scorm/locallib.php