MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade
authorTim Hunt <T.J.Hunt@open.ac.uk>
Wed, 11 May 2011 19:29:49 +0000 (20:29 +0100)
committerTim Hunt <T.J.Hunt@open.ac.uk>
Wed, 11 May 2011 19:29:49 +0000 (20:29 +0100)
commita2ac23495656d62cf4c203be72f3ff2423b2ca8a
tree28bb314e32234a4e20c6f9df112031f6eaefd71c
parentfca599a683ea99536eba1ffcb10faf72c3eeb93b
parentde584990c601a2c30f850b699a76cb250187d529
MDL-20636 Merge remote-tracking branch 'moodle/master' into upgrade

Conflicts:
lib/filestorage/file_storage.php
mod/quiz/attemptlib.php
mod/quiz/lib.php
mod/quiz/mod_form.php
mod/quiz/report/overview/overview_table.php
mod/quiz/report/overview/report.php
mod/quiz/report/responses/report.php
mod/quiz/report/responses/responses_table.php
mod/quiz/report/statistics/db/install.xml
mod/quiz/report/statistics/qstats.php
mod/quiz/report/statistics/report.php
mod/quiz/report/statistics/statistics_question_table.php
mod/quiz/report/statistics/statistics_table.php
mod/quiz/report/statistics/version.php
mod/quiz/review.php
mod/quiz/reviewquestion.php
mod/quiz/startattempt.php
mod/quiz/styles.css
mod/quiz/view.php
question/type/essay/questiontype.php
question/type/match/backup/moodle2/backup_qtype_match_plugin.class.php
question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php
question/type/numerical/display.html
question/type/numerical/questiontype.php
question/type/questiontype.php
question/type/random/questiontype.php
question/type/shortanswer/questiontype.php
theme/base/style/question.css
27 files changed:
admin/generator.php
backup/moodle2/backup_stepslib.php
backup/moodle2/restore_stepslib.php
lib/adminlib.php
lib/cronlib.php
lib/moodlelib.php
local/qedatabase/db/install.php
local/qedatabase/db/upgrade.php
mod/quiz/overrides.php
mod/quiz/renderer.php
mod/quiz/report/attemptsreport.php
mod/quiz/report/grading/report.php
mod/quiz/report/overview/overview_table.php
mod/quiz/report/reportlib.php
mod/quiz/report/statistics/db/install.xml
mod/quiz/report/statistics/db/upgrade.php
mod/quiz/report/statistics/qstats.php
mod/quiz/report/statistics/report.php
mod/quiz/styles.css
mod/quiz/view.php
question/editlib.php
question/engine/bank.php
question/engine/datalib.php
question/engine/simpletest/testdatalib.php
question/type/match/backup/moodle2/restore_qtype_match_plugin.class.php
question/type/multianswer/questiontype.php
theme/base/style/question.css