Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 00:53:49 +0000 (08:53 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 00:53:49 +0000 (08:53 +0800)
commit08cf1d787eb271a868b667c0cff64ea818f67190
treef1cb19a464136c59bb7df3668372ff27bffb6d5f
parent0f4fc5a87852f3e99e185bdefbeb92dd915175bc
parent3babdf83fe4554b47717991f2066100cfa30f02c
Merge branch 'master_MDL-43011' of git://github.com/danmarsden/moodle
mod/scorm/player.php