Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 05:05:47 +0000 (13:05 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 05:05:47 +0000 (13:05 +0800)
1  2 
mod/scorm/lang/en/scorm.php

Simple merge