Merge branch 'MDL-32750' of git://github.com/colchambers/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 Jan 2013 22:57:17 +0000 (11:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 Jan 2013 22:57:17 +0000 (11:57 +1300)
commitdff72cde30c1b35df8e1bb59d1d671111c2dda9d
tree1e5b05b01ebd1eca5d590674f9cdbe40ba588483
parent0f54ac5698aac75c2dd5701c77f027050106bedb
parent2a22be64ee8129912c44f28b977c05143231736f
Merge branch 'MDL-32750' of git://github.com/colchambers/moodle
lib/editor/tinymce/lib.php
lib/form/editor.php
question/type/edit_question_form.php