Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle
commit72c0f16889f5bb7d395ce0fd19b5e03af99ec800
authorMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 00:53:58 +0000 (8 08:53 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 00:53:58 +0000 (8 08:53 +0800)
tree51d28f85e6b2ff649c9c637bf85fb2bd2dd399f6
parent08cf1d787eb271a868b667c0cff64ea818f67190
parente0eac0c6f32f195fd0109983865917a22da75858
Merge branch 'master_MDL-44938' of git://github.com/danmarsden/moodle
mod/scorm/db/upgrade.php