Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 02:12:21 +0000 (10:12 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 02:12:21 +0000 (10:12 +0800)
commit38569ad3a23ca6a33cca9743307b1128f466d931
treea287761f31e9bfd1c3fa1eaf0242f42f88d7204f
parentb9c871b18a215db1e56a1ad43d2b4963a610744e
parentcb6782d4a5228d09fb07279b1e6c683935347456
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
mod/scorm/lang/en/scorm.php