Merge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2012 10:17:04 +0000 (12:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2012 10:17:04 +0000 (12:17 +0200)
1  2 
mod/scorm/locallib.php

Simple merge