Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle into MOODLE_23_...
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jul 2012 04:18:29 +0000 (12:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Jul 2012 04:18:29 +0000 (12:18 +0800)
commit741543e9a7fb6936f769c2d967b16c9a250dbe73
treecb85e42ebbd9e64e7b98a9aac34a5bbc6dafb5c6
parenta1a00aeee7c9291b51266d9bd3de89a7b89a636c
parente0d90c54c040fc8d7e42a39aadf644f5fae93c36
Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

Conflicts:
mod/scorm/db/upgrade.php
mod/scorm/db/upgrade.php