Merge branch 'MDL-37374' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 02:22:55 +0000 (10:22 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 02:22:55 +0000 (10:22 +0800)
1  2 
question/type/edit_question_form.php

Simple merge