Merge branch 'MDL-36534' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 06:44:28 +0000 (14:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 06:44:28 +0000 (14:44 +0800)
1  2 
lang/en/question.php
question/type/edit_question_form.php

Simple merge
Simple merge