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)
commitec25a72c4d917ae3773fab2cfb1f695b2ac80258
tree231240d625d41d053f2a188ae290db7fe57faa3d
parentdf087b865b41bc5b407383b120f5834ebbdddea3
parent3cfffd8c3eb330b426e984e0faa2a86e3f113212
Merge branch 'master_MDL-27036' of git://github.com/danmarsden/moodle
mod/scorm/lang/en/scorm.php