Merge branch 'master_MDL-41580' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:27:44 +0000 (09:27 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 24 Sep 2013 21:27:44 +0000 (09:27 +1200)
1  2 
mod/scorm/lang/en/scorm.php
mod/scorm/lib.php
mod/scorm/locallib.php
mod/scorm/mod_form.php
repository/lib.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge