Merge branch 'w41_MDL-35645_m24_tinymcebuttons' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:31:08 +0000 (00:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:31:08 +0000 (00:31 +0200)

Trivial merge