Merge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2011 19:24:39 +0000 (21:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2011 19:24:39 +0000 (21:24 +0200)

Trivial merge