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

Simple merge