Merge branch 'MDL-57510-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Mar 2017 08:41:27 +0000 (09:41 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Mar 2017 08:41:27 +0000 (09:41 +0100)
1  2 
question/renderer.php

Simple merge