Merge branch 'MDL-51434-master' of git://github.com/jleyva/moodle

author David Monllao <davidm@moodle.com>

Tue, 6 Oct 2015 01:21:44 +0000 (09:21 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 6 Oct 2015 15:26:53 +0000 (16:26 +0100)
author David Monllao <davidm@moodle.com>
Tue, 6 Oct 2015 01:21:44 +0000 (09:21 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:26:53 +0000 (16:26 +0100)
diff --cc mod/scorm/classes/external.php
Simple merge
author	David Monllao <davidm@moodle.com>
	Tue, 6 Oct 2015 01:21:44 +0000 (09:21 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 6 Oct 2015 15:26:53 +0000 (16:26 +0100)