Merge branch 'MDL-52683-master' of git://github.com/s-cenni/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jan 2016 07:32:26 +0000 (15:32 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:16 +0000 (10:15 +0800)
commit0b8be05caff3f1128225062fe84e8ff50741adb6
treeb81f0a8ee5facf6131f3c7ba17aa720ab5080189
parent0e5458f45f92716a941bc87b567877289e73932d
parentee8a2e2ed9e62b1b312269d08fdbfdfb314d4529
Merge branch 'MDL-52683-master' of git://github.com/s-cenni/moodle
mod/scorm/locallib.php