Merge branch 'MDL-33048' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 May 2012 04:12:51 +0000 (12:12 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 May 2012 04:12:51 +0000 (12:12 +0800)
1  2 
mod/quiz/lib.php

Simple merge