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)
1  2 
mod/scorm/lang/en/scorm.php
mod/scorm/locallib.php
mod/scorm/player.php

Simple merge
Simple merge
Simple merge