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)
commit864ff70c742e4197b0bccc1fddecef99c06fce4a
treeeddb8152faac74a0c945deabb02f6f9331344a28
parenta85d61e81272a9060fbdefc06c2aadab709ca253
parent5574862063699039658f0a28449ac911244794d2
Merge branch 'MDL-36534' of git://github.com/timhunt/moodle
lang/en/question.php
question/type/edit_question_form.php