Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:28:49 +0000 (09:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Apr 2014 20:28:49 +0000 (09:28 +1300)
commit9b1a4cde78a795199e2d97f4ae882e6534a69246
tree1d92ececa2a93a44c7d1d91f6e7f482968c509a8
parent0ea11b7ceee7a1f61e3d6b65af230f5cdb18039c
parent5ce4583a46882a3f790fffcddc83ad5699418397
Merge branch 'MDL-44834-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-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/src/editor/js/editor.js