Merge branch 'MDL-44677_scorm_commit' of git://github.com/davosmith/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 03:14:52 +0000 (11:14 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 03:14:52 +0000 (11:14 +0800)

Trivial merge