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)
commit322d9c8cdafccbd5143ff6ac0abc3664d2e3815f
tree9306e48715614338e1613f3bb5be82b5256d0780
parent18784adb1263c3496d23527a6db8d1d4249c7ffe
parent8d29a8c3bc9dea0c28e0b5ed842afe7f06eb393b
Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle

Conflicts:
mod/scorm/db/upgrade.php