Merge branch 'MDL-31080' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2012 00:58:51 +0000 (01:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2012 00:58:51 +0000 (01:58 +0100)
commit2176ed55e9dc03f643aeec4387d350bf8b781cf0
tree60e7d413248348e26a366228e0020f0c78ee384a
parentec43e2267c7f8948c3a8899b25ca804f53fe6e49
parent068384ce651eb26c73f403056e9e9b1513b8acc4
Merge branch 'MDL-31080' of git://github.com/timhunt/moodle
mod/quiz/editlib.php
mod/quiz/lang/en/quiz.php
mod/quiz/locallib.php