Merge branch 'MDL-31554' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 02:26:06 +0000 (15:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 02:26:06 +0000 (15:26 +1300)
1  2 
mod/quiz/view.php

Simple merge