Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 26 Sep 2013 23:32:05 +0000 (11:32 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 26 Sep 2013 23:32:05 +0000 (11:32 +1200)
Conflicts:
mod/scorm/db/upgrade.php


Trivial merge