Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github...
authorDan Poltawski <dan@moodle.com>
Tue, 16 Apr 2013 12:26:34 +0000 (13:26 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Apr 2013 12:26:34 +0000 (13:26 +0100)

Trivial merge