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