Merge branch 'master_MDL-27858' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jun 2011 23:18:05 +0000 (01:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jun 2011 23:18:05 +0000 (01:18 +0200)
1  2 
mod/scorm/lib.php

Simple merge