Merge branch '44180-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 04:47:17 +0000 (12:47 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 04:47:17 +0000 (12:47 +0800)
1  2 
mod/quiz/backup/moodle2/backup_quiz_stepslib.php
mod/quiz/backup/moodle2/restore_quiz_stepslib.php
mod/quiz/edit.php
mod/quiz/editlib.php
mod/quiz/lib.php
mod/quiz/locallib.php
mod/quiz/mod_form.php
mod/quiz/override_form.php
mod/quiz/tests/quizobj_test.php
mod/quiz/version.php
mod/quiz/view.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge