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

Trivial merge