Merge branch 'MDL-52556-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 11:17:11 +0000 (11:17 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 11:17:11 +0000 (11:17 +0000)
1  2 
mod/scorm/classes/external.php
mod/scorm/tests/externallib_test.php

Simple merge
Simple merge