Merge branch 'MDL-43670' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 03:25:38 +0000 (11:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 03:25:38 +0000 (11:25 +0800)
1  2 
mod/quiz/editlib.php

Simple merge