Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:26:52 +0000 (14:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:26:52 +0000 (14:26 +0800)

Trivial merge