help and template fix
Merge branch 'master' into MOODLE_26_STABLE
typo in config
Merge branch 'MOODLE_26_STABLE' of https://github.com/dthies/moodle-editor_tinymce-mathslate into MOODLE_26_STABLE
Merge branch 'master' into MOODLE_26_STABLE
update