Merge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Mar 2015 11:25:55 +0000 (11:25 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Mar 2015 11:25:55 +0000 (11:25 +0000)
1  2 
mod/quiz/lang/en/quiz.php

Simple merge