Merge branch 'MDL-42504' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Nov 2013 02:30:16 +0000 (10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Nov 2013 02:30:16 +0000 (10:30 +0800)
1  2 
mod/quiz/renderer.php

Simple merge