Merge branch 'master_MDL-28295' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 20:46:42 +0000 (22:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Aug 2011 20:46:42 +0000 (22:46 +0200)
1  2 
mod/scorm/db/upgrade.php

Simple merge