Merge branch 'MDL-55057_scorm_apostrophe' of git://github.com/davosmith/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 04:59:09 +0000 (12:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 04:59:09 +0000 (12:59 +0800)

Trivial merge