Merge branch 'MDL-29427_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit4d7a9cd8f59e2da6f270110e47db46422d2c3885
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 20:01:35 +0000 (26 22:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 20:01:35 +0000 (26 22:01 +0200)
tree8863292956b8d2587c7ad6ea7fee193be456e481
parentba1afa0d9561c55807451c7052fbb1b0402da89e
parent5d81093e3ca85ba8a6e634fd06ca5a9aba163b76
Merge branch 'MDL-29427_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
mod/quiz/lang/en/quiz.php