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)
commit0f97fc6c3f7df5bfb5bf4fb23e6ae5f089f7b9e0
tree1f452280e878dd3d7b6a94f55db76176eb7f216e
parent5d5db1030f2d9336c775d218f6222b5e14f0c010
parenta4100d4de3dfb383d557ab8510731ba030dc1a0d
Merge branch 'MDL-52750' of git://github.com/timhunt/moodle
mod/quiz/lang/en/quiz.php
mod/quiz/renderer.php