Merge branch 'master_MDL-28937' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 23:52:59 +0000 (01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 23:52:59 +0000 (01:52 +0200)
1  2 
mod/scorm/locallib.php

Simple merge