Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 03:49:39 +0000 (11:49 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 03:49:39 +0000 (11:49 +0800)
commitd2b8b67a9cd3846038bf044deff56de53d4e2cc7
tree20175d9ccaad30b3150e3c86c10d584971bee50f
parent3ff2fae230ce4cc64c7c36c78cf2a4c0466bba1c
parente41b0e75432794d81c976efd9adf2dec74bc83b8
Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle

Conflicts:
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-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