Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 05:14:09 +0000 (13:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 05:14:09 +0000 (13:14 +0800)
commit961f70adcdcbce0a8b17a017ea037004d0fe0d5f
treefeea3430362fb24d903518279d0b2647e18997d1
parentf8a60dfe88b01d1c675a0d4858ad89928c859a70
parent0a61619043b4c9effa0e9e0bcec9aab8c514f406
Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle
mod/scorm/lang/en/scorm.php