Merge branch 'm30_MDL-51363_Fix_Default_Settings_1x_Restore' of git://github.com...
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 01:58:08 +0000 (09:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 01:58:08 +0000 (09:58 +0800)
Conflicts:
mod/scorm/version.php


Trivial merge