Merge branch 'MDL-37465' of git://github.com/colchambers/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 18:19:29 +0000 (19:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 18:19:29 +0000 (19:19 +0100)
1  2 
question/type/edit_question_form.php

Simple merge