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

Trivial merge