Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 03:37:25 +0000 (11:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 03:37:25 +0000 (11:37 +0800)
commit23cc5bbdc0de8fc81b4aeff3bf64a648d4c41957
tree34791866b084d7859f893e89dea263cdea89b4fe
parent95ce54f0607ce792414384b669c790c007834870
parentb9d065edc4e8fb92d60d628f1d877b844a87a2e2
Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js
lib/editor/atto/yui/src/editor/js/editor-plugin-buttons.js