Merge branch 'MDL-48470-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 17:55:34 +0000 (19:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 17:55:34 +0000 (19:55 +0200)
commitd3c2a653a80a500f02262ae6bdea0828ec83f45f
treec2197a319c26fdfcc218cdf2b472f26c5a0838a0
parentd4d1b2b5a3eecf81b8c53e9b8d1848f15049e238
parent1785f52cf6eeebbd1b2ee611803590354c64ef34
Merge branch 'MDL-48470-master' of git://github.com/ankitagarwal/moodle
lang/en/grades.php
mod/quiz/lang/en/quiz.php