Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 May 2016 12:00:34 +0000 (13:00 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 19 May 2016 12:00:34 +0000 (13:00 +0100)
1  2 
lib/formslib.php

Simple merge