Merge branch 'MDL-33612' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 09:38:25 +0000 (17:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 09:38:25 +0000 (17:38 +0800)
1  2 
mod/quiz/edit.php
mod/quiz/lang/en/quiz.php

Simple merge
Simple merge