Merge branch 'MDL-28169' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 08:21:32 +0000 (10:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 08:21:32 +0000 (10:21 +0200)
1  2 
lib/db/upgrade.php
mod/scorm/db/upgrade.php

Simple merge
Simple merge