Merge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 18:14:55 +0000 (19:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 18:14:55 +0000 (19:14 +0100)
commit8e1ad9c60fcab36f3cfd8e3127af61becead20e7
treea0e8a4dfedd0283234e7d5e830312cf735e4012a
parent9f58e26db6459b674db8606c1839f204efc9b139
parent30bce58eb9ed5a5da8c95112d7710bc52701e8fe
Merge branch 'm20_MDL-26201_forcejs' of git://github.com/danmarsden/moodle
mod/scorm/lang/en/scorm.php
mod/scorm/locallib.php
mod/scorm/player.php