Merge branch 'MDL-26165' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 14:32:17 +0000 (16:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 14:32:17 +0000 (16:32 +0200)
1  2 
mod/quiz/accessrules.php
mod/quiz/lang/en/quiz.php

Simple merge
Simple merge