Merge branch 'master_MDL-30028' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 09:00:37 +0000 (17:00 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 09:00:37 +0000 (17:00 +0800)
1  2 
mod/scorm/report/basic/report.php
mod/scorm/report/interactions/report.php

Simple merge