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)
commitec467d04d92c59f444c80e63553c20d3cea47c37
treea42cf778209f195bfe7afd055d5bbe7bc2f3e0d0
parent9f707d6c9b66ab4f1f2c8d9658352113a972e7e3
parentf4b980062a845e81c00b674597deb1995adf67a3
Merge branch 'w41_MDL-35645_m24_tinymcebuttons' of git://github.com/skodak/moodle