Merge branch 'w45_MDL-36468_m24_tinymce' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 9 Nov 2012 07:54:46 +0000 (15:54 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 9 Nov 2012 07:54:46 +0000 (15:54 +0800)

Trivial merge