Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Mar 2012 03:38:09 +0000 (11:38 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Mar 2012 03:38:09 +0000 (11:38 +0800)
commit0a4660484cbe9e04563d98cd3f9bd37498c058ae
tree8b294ce3d79cfdb9df314b0931c6d39be463e3a7
parent5599f2062c7544ffe744d21523242ec3afdbdd54
parent94db27498de90f683c4076e0713d65eb140a732c
Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle

Conflicts:
mod/scorm/version.php
    mod/scorm/db/upgrade.php
mod/scorm/db/upgrade.php
mod/scorm/lang/en/scorm.php
mod/scorm/version.php