Merge branch 'master_MDL-32506' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:11:26 +0000 (21:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:11:26 +0000 (21:11 +0200)
1  2 
mod/scorm/locallib.php

Simple merge