Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Nov 2013 06:32:55 +0000 (14:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Nov 2013 06:32:55 +0000 (14:32 +0800)
commit728f924ec140a9095bcf335a40bf2607f3b54fd3
tree760650f5f14bf125ea262ffbe0e7a70721992fd3
parent61cdb947e8ebaf4cefd2ad3c4d68f5070e663398
parent47578dbff4671b5ce22cbf914f9ff947dcf2d31d
Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle

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