Merge branch 'MDL-31080' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2012 00:58:51 +0000 (01:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2012 00:58:51 +0000 (01:58 +0100)
1  2 
mod/quiz/editlib.php
mod/quiz/lang/en/quiz.php
mod/quiz/locallib.php

Simple merge
Simple merge
Simple merge