| commit | 54771d89d1571ae8521a3565f87c5ed1623565b0 | |
| author | Tim Hunt <T.J.Hunt@open.ac.uk> | |
| Mon, 6 Jun 2011 16:14:59 +0000 (6 17:14 +0100) | ||
| committer | Tim Hunt <T.J.Hunt@open.ac.uk> | |
| Mon, 6 Jun 2011 16:14:59 +0000 (6 17:14 +0100) | ||
| tree | 3422b7cae56fda2f0d2a0bf081b3098978ff58de | treesnapshot (tar.gz zip) |
| parent | 4c5743343fc01185cd95ea296954e52134ea9e40 | commitdiff |
| parent | a56c68e3f4e94815506435f6462e5ce3c3dd341e | commitdiff |
Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine
Conflicts:
lib/db/upgrade.php
mod/quiz/lib.php
Conflicts:
lib/db/upgrade.php
mod/quiz/lib.php