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)
commit91f0dd438a99a91f2a9afe1fc6e9eb775d744aa1
tree39b12997575108db7f1d4736305bc251ebdcc0e5
parent555099c66672816dbd095bbf3a1b0f8048967775
parent01b5936cd0bf1cec6832ddac3ded018b1efb842c
Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle
mod/scorm/lang/en/scorm.php