MDL-44548 mod_scorm: force an external sync to check for updated files.
MDL-47657 mod_glossary: Fixed wrong error message on edit timeout.
Merge branch 'MDL-47657-26' of git://github.com/gurgus/moodle into MOODLE_26_STABLE
Merge branch '47684-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
MDL-47710 qformat_gift: fix bahat fails due to different ids in exports
Merge branch 'MDL-47710_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
Merge branch 'm26_MDL-44548' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE
Revert "MDL-44548 mod_scorm: force an external sync to check for updated files."

This reverts commit d159b4f18ceb7f757ee726d011b37da4e115fa84.
Revert "MDL-47684 mod: better validation of rating options"

This reverts commit ee1389b8f79c6533151300cf5e100cf26fda9cc0.
weekly release 2.6.5+
MDL-47684 mod: better validation of rating options