Merge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 07:00:26 +0000 (15:00 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 07:00:26 +0000 (15:00 +0800)

Trivial merge