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

Trivial merge