Merge branch 'master_MDL-34848' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2012 07:57:00 +0000 (09:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2012 07:57:00 +0000 (09:57 +0200)
1  2 
mod/scorm/lib.php

Simple merge