Merge branch 'MDL-50228' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jun 2015 23:29:46 +0000 (01:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jun 2015 23:29:46 +0000 (01:29 +0200)
commit1df669e7bfb4c2ca517d9cbb45dfe7354e9c47e9
tree130e5bef7302e4eb3d1db3aca28a9825f8e39e4c
parent23abab38e7b0a06a6c1749f01e97cd1c1610982d
parent1bad9be67afffef28361c0b3e557feaadd8e66bf
Merge branch 'MDL-50228' of git://github.com/timhunt/moodle
mod/quiz/lang/en/quiz.php
mod/quiz/settings.php