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)
1  2 
mod/scorm/locallib.php

Simple merge