MDL-20636 Merge vle/master into ouqe2
authorTim Hunt <T.J.Hunt@open.ac.uk>
Wed, 2 Mar 2011 17:34:18 +0000 (17:34 +0000)
committerTim Hunt <T.J.Hunt@open.ac.uk>
Wed, 2 Mar 2011 17:34:18 +0000 (17:34 +0000)
commite2cba246b724efe1ef72bc98d70b92e37999a0be
treede7a090a4b36c760afb9badaf037295d38c7ebfb
parent404da2381292db414223393ed8e8bf19e4c13e6e
parenteabbb121bbe069526a02fc035e41360e83b4aea1
MDL-20636 Merge vle/master into ouqe2

Conflicts:
mod/quiz/locallib.php
mod/quiz/report/overview/overview_table.php
mod/quiz/report/overview/report.php
mod/quiz/report/responses/report.php
question/type/random/questiontype.php
lib/adminlib.php
lib/moodlelib.php
mod/quiz/backup/moodle2/backup_quiz_stepslib.php
mod/quiz/backup/moodle2/restore_quiz_stepslib.php
mod/quiz/locallib.php
question/format/gift/simpletest/testgiftformat.php
question/qengine.js
question/type/numerical/questiontype.php
question/type/random/backup/moodle2/restore_qtype_random_plugin.class.php