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