Merge branch 'MDL-31726' of git://github.com/colchambers/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 20:44:38 +0000 (21:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jan 2013 20:44:38 +0000 (21:44 +0100)
1  2 
lang/en/question.php
question/type/edit_question_form.php

Simple merge
Simple merge