Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 06:31:27 +0000 (14:31 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 06:31:27 +0000 (14:31 +0800)
1  2 
mod/quiz/lib.php

Simple merge