Merge branch 'MDL-51564-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 13:36:51 +0000 (14:36 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:32:55 +0000 (16:32 +0100)
commitf5e68c289254938c94eb638a24e6728d703c9dfb
tree5aa4f446de32235ca5435821c6a5e651d2cf3b7a
parent67f2463f34de8e30b4560a4e4076d2a57d2f23bf
parent9748791ba8b819ffe621b1a03a6abec73dce93a2
Merge branch 'MDL-51564-master' of git://github.com/jleyva/moodle
lib/upgrade.txt
mod/scorm/classes/external.php
webservice/upgrade.txt