Merge branch 'MDL-30545' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Nov 2012 05:21:50 +0000 (13:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Nov 2012 05:21:50 +0000 (13:21 +0800)
1  2 
mod/quiz/lib.php

Simple merge