Merge branch 'MDL-29164' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 03:47:16 +0000 (16:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 03:47:16 +0000 (16:47 +1300)
1  2 
mod/quiz/lang/en/quiz.php

Simple merge