Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 14:25:13 +0000 (00:25 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 14:25:13 +0000 (00:25 +1000)
commit5f65d37cd276982a25ac8090b2602a69a48d155c
tree21024bd350907d1b62f5711f9abe2eb0ba98b113
parent7b6f5c8d1e7421c50c0446a6c3e8278942d3f2d7
parent99da7a9523005fa7a9ca2f481b22755d360f33f4
Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git
mod/scorm/locallib.php
mod/scorm/module.js