Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine
authorTim Hunt <T.J.Hunt@open.ac.uk>
Mon, 6 Jun 2011 16:14:59 +0000 (17:14 +0100)
committerTim Hunt <T.J.Hunt@open.ac.uk>
Mon, 6 Jun 2011 16:14:59 +0000 (17:14 +0100)
commit54771d89d1571ae8521a3565f87c5ed1623565b0
tree3422b7cae56fda2f0d2a0bf081b3098978ff58de
parent4c5743343fc01185cd95ea296954e52134ea9e40
parenta56c68e3f4e94815506435f6462e5ce3c3dd341e
Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine

Conflicts:
lib/db/upgrade.php
mod/quiz/lib.php
backup/moodle2/backup_stepslib.php
backup/moodle2/restore_stepslib.php
lib/db/install.xml
mod/quiz/lib.php