Merge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 01:03:25 +0000 (02:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 01:03:25 +0000 (02:03 +0100)
1  2 
mod/scorm/lang/en/scorm.php

Simple merge