Merge branch 'MDL-51434-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Oct 2015 01:21:44 +0000 (09:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:26:53 +0000 (16:26 +0100)
commitc6ce30bb3ff572761f6b974c5e1e3d9aaa83bd01
tree65059824293137e47d5e5fc22a298041db9acdcf
parent8b6ceab95321259568605adc0b92cf1de6f4cd79
parent8b06acf76c35558405905a419522ab7b12e75f41
Merge branch 'MDL-51434-master' of git://github.com/jleyva/moodle
mod/scorm/classes/external.php