Merge branch 'MDL-52455' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 12:43:01 +0000 (12:43 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 12:43:01 +0000 (12:43 +0000)
1  2 
mod/quiz/locallib.php

Simple merge