Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle
[moodle.git] / lib / editor / index.html