Merge branch 'MDL-52750' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 15:50:11 +0000 (15:50 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 15:50:11 +0000 (15:50 +0000)
1  2 
mod/quiz/lang/en/quiz.php
mod/quiz/renderer.php

Simple merge
Simple merge