Merge branch 'MDL-25801' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Apr 2012 01:11:38 +0000 (09:11 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Apr 2012 01:11:38 +0000 (09:11 +0800)
1  2 
mod/quiz/editlib.php

Simple merge